7. Workers And Citizens
Workers
- Workers execute registered work areas, storage requests, and settlement work orders. Right-click a worker to open a ledger with owner, authority token, claim relation, assignment, problem text, and transport status. If the ledger says Ownership mismatch or Foreign claim, fix claim/state/work-area ownership first. Use X for group worker commands such as follow, guard, move, and stop. Civilian work-area editors now show sync state in the top-right corner, warn when no owner is assigned yet, and call out missing seeds, saplings, or tunnel settings directly in the screen. While a work-area screen is open its zone box is visible again, and B toggles a culled overlay of nearby work areas you are allowed to control.
+ Workers execute registered work areas, storage requests, and settlement work orders. Right-click a worker to open a ledger with owner, authority token, claim relation, assignment, problem text, and transport status. The ledger's Actions menu contains To Citizen and Dismiss: To Citizen turns the worker into a free citizen with a short auto-assignment pause, while Dismiss releases the current work area and removes the worker entity. Dismiss is accepted only from the worker owner or an admin; denied attempts leave worker state unchanged. If the ledger says Ownership mismatch or Foreign claim, fix claim/state/work-area ownership first. Use X for group worker commands such as follow, guard, move, and stop. Civilian work-area editors now show sync state in the top-right corner, warn when no owner is assigned yet, and call out missing seeds, saplings, or tunnel settings directly in the screen. While a work-area screen is open its zone box is visible again, and B toggles a culled overlay of nearby work areas you are allowed to control.
+ Assign Home: citizen profiles, worker ledgers, and recruit inventories have an Assign Home button. It closes the screen and gives you 30 seconds to right-click a bed. The HUD shows remaining time; Esc cancels, and timeout cancels automatically. Cancelled selectors do not change home, and the server only accepts valid beds from the owner or an admin.
Why a worker idles
- The worker is not owned by the correct player or political side.
- The target work area is outside a friendly claim.
- The building was never validated or registered.
- The settlement has no matching vacancy or no free citizen.
- The required item is missing from storage.
- The worker already has another active claim or its previous claim has not been released yet.
Citizens
@@ -242,7 +243,8 @@ Налоги и стратегические роли
7. Жители и работники
Работники
- Работники выполняют работу в зарегистрированных зонах, запросы складов и поручения поселения. Правая кнопка по работнику открывает книгу со владельцем, токеном власти, отношением к клейму, назначением, проблемой и транспортом. Если в книге видно Несовпадение владения или Чужое владение, сначала выровняй владение клейма, государства и рабочей зоны. Клавиша X открывает групповые приказы работникам: следовать, охранять, идти в точку, остановиться. Гражданские экраны рабочих зон теперь показывают состояние синхронизации в правом верхнем углу, предупреждают об отсутствии владельца и прямо в экране подсказывают про семена, саженцы и настройки шахты. Пока экран рабочей зоны открыт, её короб снова виден, а клавиша B включает отсечённую по видимости подсветку ближайших рабочих зон, которыми тебе разрешено управлять.
+ Работники выполняют работу в зарегистрированных зонах, запросы складов и поручения поселения. Правая кнопка по работнику открывает книгу со владельцем, токеном власти, отношением к клейму, назначением, проблемой и транспортом. В меню Действия есть В гражданина и Уволить: первое превращает работника в свободного жителя с короткой паузой автоназначения, второе освобождает текущую рабочую зону и удаляет сущность работника. Увольнение принимает только серверный запрос владельца или администратора; при отказе состояние работника не меняется. Если в книге видно Несовпадение владения или Чужое владение, сначала выровняй владение клейма, государства и рабочей зоны. Клавиша X открывает групповые приказы работникам: следовать, охранять, идти в точку, остановиться. Гражданские экраны рабочих зон теперь показывают состояние синхронизации в правом верхнем углу, предупреждают об отсутствии владельца и прямо в экране подсказывают про семена, саженцы и настройки шахты. Пока экран рабочей зоны открыт, её короб снова виден, а клавиша B включает отсечённую по видимости подсветку ближайших рабочих зон, которыми тебе разрешено управлять.
+ Назначить дом: профиль жителя, книга работника и инвентарь рекрута имеют кнопку назначения дома. Она закрывает экран и даёт 30 секунд, чтобы нажать ПКМ по кровати. HUD показывает остаток времени; Esc отменяет выбор, а тайм-аут отменяет его автоматически. Отмена не меняет дом, а сервер принимает только настоящую кровать от владельца или администратора.
Почему работник стоит без дела
- Работник принадлежит не тому игроку или не той стороне.
- Нужная зона вне своего защищённого участка.
- Здание не проверено или не зарегистрировано.
- Нет подходящей вакансии или свободного жителя.
- Нужного предмета нет на складе.
- У работника уже есть другое активное поручение или старое поручение ещё не освобождено.
Жители
diff --git a/docs/BANNERMOD_BACKLOG.json b/docs/BANNERMOD_BACKLOG.json
index 1daea512..6f497c1d 100644
--- a/docs/BANNERMOD_BACKLOG.json
+++ b/docs/BANNERMOD_BACKLOG.json
@@ -5380,7 +5380,7 @@
"id": "PERF-011A",
"title": "Run PERF-011 client large-crowd profiling proof",
"status": "in_progress",
- "updated": "2026-04-30",
+ "updated": "2026-05-08",
"why": "PERF-011 cannot honestly close until a real client before/after profiling run proves the distant recruit renderer cut improves large crowds without harming close-range selected readability.",
"scope": [
"Run a controlled client large-crowd recruit render profiling scenario against the pre-cut baseline and the PERF-011 implementation.",
@@ -5399,6 +5399,10 @@
{
"date": "2026-04-30",
"text": "Resumed on feature/cleanup-batch-9 to determine whether existing profiling evidence already satisfies the before/after proof requirement."
+ },
+ {
+ "date": "2026-05-08",
+ "text": "blocked in this API/headless environment: no repo-local headless profiling harness was found for a controlled large-crowd recruit render scenario or close-range selected-readability visual check. Required next step is a real Minecraft client run: capture before/after recruit.render counters for PERF-011 and record selected-recruit readability."
}
],
"verification": [],
@@ -6498,7 +6502,7 @@
"id": "WORKERUI-001",
"title": "WorkerStatusScreen needs profession reassignment, dismiss, wage controls",
"status": "in_progress",
- "updated": "2026-05-03",
+ "updated": "2026-05-08",
"why": "Audit (UI_AUDIT_FINDINGS.md) flagged the screen advertises management but only exposes Refresh/Convert/Close. Players have no UI path to reassign a worker's profession, dismiss them, or set a wage.",
"scope": [
"Add ActionMenuButton or DropDownMenu to WorkerStatusScreen with: (1) Reassign profession entry that opens a profession picker; (2) Dismiss entry that sends a server-validated MessageDismissWorker; (3) Wage adjustment +/- pad if the wage system exposes a setter.",
@@ -6510,11 +6514,19 @@
"Each new server message round-trips through ownership validation; non-owner click results in denied feedback in client and no state change server-side (covered by a unit test on the message handler)",
"MULTIPLAYER_GUIDE_EN.md and MULTIPLAYER_GUIDE_RU.md describe the new controls in the worker management section"
],
- "dependencies": [],
+ "dependencies": [
+ "WORKERUI-001A",
+ "WORKERUI-001B",
+ "WORKERUI-001C"
+ ],
"progress": [
{
"date": "2026-05-03",
"text": "Implemented Reassign Profession + clarified Convert as dismiss path. Wage system not present in codebase; acceptance #2 (wage) descoped. ActionMenuButton in WorkerStatusScreen offers all 7 CONTROLLED_WORKER professions except current. Server message reuses WorkerCitizenConversionService auth. New WorkerStatusReassignContractTest pins source invariants."
+ },
+ {
+ "date": "2026-05-08",
+ "text": "assessed without edits: WorkerStatusScreen partially implements Reassign via ActionMenuButton and MessageReassignWorkerProfession with localization/docs, but task is not closable. Missing explicit MessageDismissWorker/Dismiss control, missing MessageSetWorkerWage/wage controls, wage system appears absent, and required non-owner handler-level denial/no-state-change test is missing. Remaining scope moved into WORKERUI-001A/B/C."
}
],
"verification": [],
@@ -6525,8 +6537,8 @@
{
"id": "WORLDMAPCLAIMPE-001",
"title": "Move existing claim into a different political entity",
- "status": "in_progress",
- "updated": "2026-05-03",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Audit of multi-settlement-state UX (UI_AUDIT_FINDINGS + user playtest) found a real gap: a claim's owning political entity is fixed at creation. There is no UI or command to transfer an existing settlement claim into another state. The current workaround forces players to delete and re-claim, losing all in-claim state.",
"scope": [
"Server-side: add MessageReassignClaimPoliticalEntity(claimUuid, newPoliticalEntityUuid). Auth: caller must be leader (or REPUBLIC co-leader) of BOTH the source PE (or admin claim caller) AND the target PE; reuse PoliticalEntityAuthority.canAct gating. On success mutate RecruitsClaim.setOwnerPoliticalEntityId, persist, and broadcast claim snapshot.",
@@ -6547,10 +6559,16 @@
"text": "Implemented MessageReassignClaimPoliticalEntity (server-authoritative dual-PE auth via ClaimPacketAuthority + PoliticalEntityAuthority.canAct), wired ClaimEditScreen Transfer dropdown + ConfirmScreen, added EN+RU lang, updated both player guides, ClaimTransferContractTest pins all surfaces."
}
],
- "verification": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) ClaimEditScreen exposes the Transfer to state UI, filters target states through WarClientState entities plus PoliticalEntityAuthority.canAct, and sends MessageReassignClaimPoliticalEntity after confirmation. 2) MessageReassignClaimPoliticalEntity validates source and target authority, mutates RecruitsClaim.ownerPoliticalEntityId, republishes through ClaimEvents.claimManager().addOrUpdateClaim, and marks client claims stale from the UI path. 3) ClaimTransferContractTest covers UI/message/catalog/lang/guide wiring, and MessageReassignClaimPoliticalEntityTest covers authorized transfer, republish, and denied transfer leaving the claim unchanged. 4) en_us and ru_ru transfer keys exist; both multiplayer guides describe the flow. 5) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
"evidence": [
"UI_AUDIT_FINDINGS.md (audit doc) + user playtest report '2026-05-03'"
- ]
+ ],
+ "doneDate": "2026-05-08"
},
{
"id": "SKILLTREE-001",
@@ -6586,8 +6604,8 @@
{
"id": "HOMEASSIGN-001",
"title": "Assign-home button for citizens, workers, and recruits",
- "status": "in_progress",
- "updated": "2026-05-06",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Player wants to manually anchor a citizen/worker/recruit to a specific dwelling so they sleep / return to it. Recruits already carry an upkeepPos field that's conceptually a home, but workers/citizens have no equivalent and there's no UI to set one for any of the three. Without manual override the AI just wanders to whatever the staffing pipeline picked.",
"scope": [
"(a) Add homePos (BlockPos) + homeBuildAreaUUID (UUID) NBT/synched fields on AbstractCitizenEntity and AbstractWorkerEntity; reuse existing upkeepPos+upkeepUUID on AbstractRecruitEntity to mean 'home' for the recruit case (or alias). (b) Server-side packet MessageAssignHome(entityUuid, BlockPos|UUID) — validates ownership and that the target is a HousePrefab/bed/sleeping-zone block. (c) Client UI: 'Assign Home' button on CitizenProfileScreen, RecruitInventoryScreen, and worker profile screen. Two-step flow: click button → 'right-click target block within 30s'. (d) AI goal: at night or low-stamina, entity pathfinds back to homePos via AsyncGroundPathNavigation; once within 3 blocks, sleeps/idles. (e) Persistence + sync. (f) Localization en_us/ru_ru."
@@ -6596,9 +6614,9 @@
"All three entity types expose Assign Home button in their profile screen; button opens a 30-second 'right-click target' selector that accepts beds and validated sleeping zones; assigned home survives save/load; entities pathfind to home at night and on /restart; ./gradlew compileJava and gametest both green."
],
"dependencies": [
- "HOMEASSIGN-002",
- "HOMEASSIGN-003",
- "HOMEASSIGN-004"
+ "HOMEASSIGN-001A",
+ "HOMEASSIGN-001B",
+ "HOMEASSIGN-001C"
],
"progress": [
{
@@ -6608,10 +6626,20 @@
{
"date": "2026-05-06",
"text": "HOMEASSIGN-002 server data model + MessageAssignHome packet shipped (commits 9a535f8c..86da2ca5 on feature/homeassign-001). Acceptance items still open: HOMEASSIGN-003 (AI goto-home goal), HOMEASSIGN-004 (Assign Home button + 30s right-click selector on the three profile screens), and the player-guide updates that go with the UI slice. Compile / gametest gates green; baseline build was rescued (4 pre-existing javac errors fixed in the same branch)."
+ },
+ {
+ "date": "2026-05-08",
+ "text": "verified dependencies HOMEASSIGN-002/003/004 are done and compileJava passes, but parent acceptance is not fully satisfied: MessageAssignHome currently accepts only BedBlock targets rather than validated sleeping zones; pathfind/restart evidence does not prove bounded movement-to-home for all three entity types; verifyGameTestStage currently fails required test unrelatedclaimstateispreservedwhensiblingclaimisdeleted. Remaining closure scope moved into HOMEASSIGN-001A/B/C."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "All dependencies HOMEASSIGN-002/003/004 and follow-up children HOMEASSIGN-001A/B/C are done. All three entity types expose Assign Home buttons in CitizenProfileScreen, WorkerStatusScreen, and RecruitInventoryScreen; the 30-second right-click selector is localized, handles ESC/timeout, and sends MessageAssignHome. MessageAssignHome is server-authoritative, accepts beds plus validated sleeping zones, rejects invalid/foreign targets, and GameTests prove accepted targets update homePos. Persistence/sync coverage from HOMEASSIGN-002 is done. BannerModPathfindHomeGoalGameTests prove recruit, worker, and citizen reach within 3 blocks at night and a rebuilt/restart goal resumes to home. Integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "CIT-001",
@@ -6924,8 +6952,8 @@
{
"id": "SETTREFACTOR-001",
"title": "Split BannerModSettlementService (1585 LOC) god class",
- "status": "in_progress",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "settlement/BannerModSettlementService.java holds claim refresh, snapshot building, validator binding, treasury hooks, sea-trade derivation, stockpile seeding in one class. Change-magnet, hard-to-review, slow-to-merge. Source: review Part A 3.4 / Top-20 #2 / VERIFIED. Note 1060-LOC test BannerModSettlementServiceTest must split alongside (Part B B7).",
"scope": [
"Extract three classes: SettlementClaimBindingService (refresh/binding), SettlementTreasuryDerivationService (treasury hook integration), SettlementSeaTradeAnalyzer (sea-trade hints derivation)",
@@ -6950,14 +6978,20 @@
"text": "Split into SETTREFACTOR-002 (binding service), SETTREFACTOR-003 (treasury derivation), SETTREFACTOR-004 (sea-trade analyzer), SETTREFACTOR-005 (residual trim + parity). Original 1585-LOC service + 1060-LOC test cannot be carried to acceptance in one slice."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "Verified closure after child tasks SETTREFACTOR-002/-003/-004/-005 are done: BannerModSettlementService is 74 LOC, extracted classes and matching tests exist for SettlementClaimBindingService, SettlementTreasuryDerivationService, and SettlementSeaTradeAnalyzer, old BannerModSettlementServiceTest is absent, BannerModSettlementSnapshotRuntimeTest.fixedScenarioSnapshotNbtMatchesBaselineByteForByte asserts expected CompoundTag equals snapshot.toTag(), tools/backlog validate passes, and focused settlement suite passed via ctx log -- ./gradlew test --tests com.talhanation.bannermod.settlement.*."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "BLDGVALIDATOR-001",
"title": "Strategy-extract DefaultBuildingValidator (960 LOC) per building type",
- "status": "in_progress",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "settlement/validation/DefaultBuildingValidator.java has 10+ inline type-specific validation branches. Adding/changing one rule requires touching the giant switch. Source: review Part A 3.4 / Top-20 #3 / VERIFIED.",
"scope": [
"Strategy interface BuildingTypeValidator. One implementation per type (FarmValidator, MineValidator, BarracksValidator, ...)",
@@ -6982,8 +7016,14 @@
"text": "Split into BLDGVALIDATOR-002 (strategy interface + dispatcher), BLDGVALIDATOR-003 (per-type validator extraction), BLDGVALIDATOR-004 (prefab class rename). Original 960-LOC validator with 10+ inline branches cannot be carried to acceptance in one slice."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) BLDGVALIDATOR-002 through BLDGVALIDATOR-004 are done. 2) BuildingTypeValidatorDispatcher is 47 LOC and routes BuildingType validators. 3) Concrete validators inspected are all below 150 LOC. 4) settlement/validation/DefaultBuildingValidator.java is deleted and ctx search found no DefaultBuildingValidator references. 5) PrefabFallbackValidator.java exists and the old prefab validator name is gone. 6) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "REFLCACHE-001",
@@ -7145,8 +7185,8 @@
{
"id": "WORKGOAL-001",
"title": "Migrate per-job worker goals to SettlementOrderWorkGoal-driven path",
- "status": "in_progress",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "FarmerWorkGoal, MinerWorkGoal, BuilderWorkGoal, LumberjackWorkGoal, MerchantWorkGoal, FishermanWorkGoal, AnimalFarmerWorkGoal coexist with the newer SettlementOrderWorkGoal. Behavior divergence risk: bug fixed in one, not others. Source: review Part A 5.5 / 12.3 / VERIFIED.",
"scope": [
"Verify behavior parity per-job between SettlementOrderWorkGoal and each per-job goal",
@@ -7172,14 +7212,20 @@
"text": "Split into WORKGOAL-002..WORKGOAL-008 (one per per-job goal: farmer/miner/builder/lumberjack/merchant/fisherman/animal-farmer). Each requires per-job parity verification before deletion; cannot be done atomically."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) WORKGOAL-002 through WORKGOAL-008 are done. 2) ctx search for FarmerWorkGoal, MinerWorkGoal, BuilderWorkGoal, LumberjackWorkGoal, MerchantWorkGoal, FishermanWorkGoal, and AnimalFarmerWorkGoal in src/main/java returned zero matches. 3) Worker entities use the inherited SettlementOrderWorkGoal path and migration contract tests remain in src/test. 4) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "EVENTSPKG-001",
"title": "Move services out of events/ package into runtime/ subpackages",
- "status": "in_progress",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "events/SettlementHeartbeatService, events/CitizenBirthService, events/ClaimRuntimeService, events/MovementFormationCommandService and ~5 others are services not event subscribers. Onboarding confusion. Source: review Part A 3.3 / 3.7 / A4 / Top-20 #16 / VERIFIED.",
"scope": [
"Move each service out of events/ into the matching subsystem runtime/ folder (settlement/runtime/, claim/runtime/, citizen/runtime/, army/command/runtime/)",
@@ -7204,8 +7250,14 @@
"text": "Split into EVENTSPKG-002 (settlement+claim services), EVENTSPKG-003 (citizen birth service), EVENTSPKG-004 (army command service), EVENTSPKG-005 (residual moves + guard). Per-service moves keep PRs reviewable as the parent acceptance demanded."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) EVENTSPKG-002 through EVENTSPKG-005 are done. 2) Remaining service moves and final payload relocation leave src/main/java/com/talhanation/bannermod/events/** guarded by EventPackageContractTest so only @SubscribeEvent event-host classes may remain there. 3) Imports were updated by the child tasks and final contract fix; behavior was verified by compile/test/GameTest gates. 4) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "CONFIGMERGE-001",
@@ -7510,8 +7562,8 @@
{
"id": "ADMINCMDS-001",
"title": "Admin recovery command suite",
- "status": "open",
- "updated": "2026-05-04",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Ops have no in-game commands to fix orphaned settlement / treasury / stuck worker / stuck war state. Source: review Part A 10.2 / Top-20 #20 / VERIFIED.",
"scope": [
"Add commands: /bannermod settlement prune , /bannermod treasury set , /bannermod treasury show ",
@@ -7524,16 +7576,32 @@
"acceptance": [
"Each command listed above exists, requires op, validates inputs, executes server-side, has at least one gametest covering happy path"
],
- "dependencies": [],
- "progress": [],
- "verification": [],
- "evidence": []
+ "dependencies": [
+ "ADMINCMDS-001A",
+ "ADMINCMDS-001B",
+ "ADMINCMDS-001C",
+ "ADMINCMDS-001D"
+ ],
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "Split oversized admin recovery suite into focused command-domain children: claim/treasury/trust, worker recovery, war wipe, and debug diagnostics. No implementation landed in ADMINCMDS-001; parent remains blocked on child completion."
+ }
+ ],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) Child tasks ADMINCMDS-001A through ADMINCMDS-001D are done. 2) Command registration and implementation verified in BannerModWarCommands, AdminRecoveryCommands, AdminDebugCommands, and WarDeclarationCommands. 3) Each listed command has op/input/server-side checks and happy-path coverage in BannerModAdminRecoveryCommandGameTests. 4) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "UIAUDIT-001",
"title": "Move UI_AUDIT_FINDINGS.md into docs/ and commit",
"status": "in_progress",
- "updated": "2026-05-06",
+ "updated": "2026-05-08",
"why": "Untracked 161-line per-screen UI audit (30 screens, summary table, top-5 severe findings) lives at repo root from a prior session. Real audit output, not noise. Source: review Part C 26.3 / Part A U6.",
"scope": [
"git mv UI_AUDIT_FINDINGS.md docs/UI_AUDIT_FINDINGS.md",
@@ -7545,11 +7613,17 @@
"Linked from STATUS.md",
"Working tree shows no untracked UI_AUDIT_FINDINGS.md"
],
- "dependencies": [],
+ "dependencies": [
+ "UIAUDIT-001A"
+ ],
"progress": [
{
"date": "2026-05-06",
"text": "Source file UI_AUDIT_FINDINGS.md no longer present at repo root and not in git history; cannot 'git mv' as scoped. Task stays open pending re-import of the audit content from prior-session backup. 2026-05-06 backlog-execute batch."
+ },
+ {
+ "date": "2026-05-08",
+ "text": "blocked: source root UI_AUDIT_FINDINGS.md is missing, docs/UI_AUDIT_FINDINGS.md does not exist, and docs/STATUS.md has no audit link; moved recovery/import work into UIAUDIT-001A so the parent is not left as vague in-progress work"
}
],
"verification": [],
@@ -7806,8 +7880,8 @@
{
"id": "SETTPREFIX-001",
"title": "Drop redundant BannerMod prefix on classes inside bannermod.settlement.*",
- "status": "open",
- "updated": "2026-05-04",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "30+ classes named BannerModSettlementXxx inside the bannermod.settlement package - package-prefix repetition. Bloats class headers + grep noise. Mechanical rename. Source: review Part A 12.2 / VERIFIED.",
"scope": [
"Rename via IDE refactor: BannerModSettlementService -> SettlementService, etc",
@@ -7824,14 +7898,20 @@
"BLDGVALIDATOR-001"
],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) ctx search found zero BannerModSettlement class/interface/enum/record declarations under src/main/java/com/talhanation/bannermod/settlement; 2) git ls-files found no src/main/java/com/talhanation/bannermod/settlement/**/BannerModSettlement*.java files; 3) ./gradlew compileJava runGameTestServer passed on the integration branch; 4) tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "NAMINGCONV-001",
"title": "Establish + enforce Seed/Record/Snapshot/State naming convention",
- "status": "open",
- "updated": "2026-05-04",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "These suffixes coexist in settlement/ with overlapping semantics (BannerModSettlementResidentScheduleSeed, ...SchedulePolicySeed, ...ScheduleWindowSeed, etc). Source: review Part A 12.2 / VERIFIED.",
"scope": [
"Document convention in docs/CONTRIBUTING.md: Seed = static config-derived input, Record = persistent immutable, Snapshot = live read-only view, State = mutable runtime",
@@ -7844,14 +7924,20 @@
],
"dependencies": [],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) CONTRIBUTING.md now documents Seed/Record/Snapshot/State conventions and includes a ctx-derived settlement suffix audit table. 2) Audit renamed mismatched settlement classes from Seed to Snapshot/State while preserving persisted tag keys where needed. 3) code-simplifier reviewed stale names; ./gradlew compileJava passed via ctx log; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "SKILLTREE-002",
"title": "Skill/perk data model + persistence",
- "status": "in_progress",
- "updated": "2026-05-06",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "SKILLTREE-001 phase plan step 1: a server-authoritative perk store has to exist before any combat hook, GUI, or per-archetype catalog can be wired. Layered on top of RecruitProgressionService XP/level so promote/level still works.",
"scope": [
"Define a server-authoritative perk/talent data model (perk id, owning archetype, prerequisites, point cost) with JSON registration so non-code authors can extend trees later.",
@@ -7867,15 +7953,29 @@
"Respec API zeroes the unlocked set and refunds points without losing XP/level state.",
"tools/backlog validate passes; ./gradlew compileJava is green."
],
- "dependencies": [],
+ "dependencies": [
+ "SKILLTREE-002A",
+ "SKILLTREE-002B",
+ "SKILLTREE-002C"
+ ],
"progress": [
{
"date": "2026-05-06",
"text": "Phase 1 recruit-side data model + persistence + skill-point grant shipped on feature/skilltree-001 (commits 9fa95338, a728735c, 8094af74, 27c1ca70). Done: PerkArchetype/PerkStat/PerkBonus/PerkNode/PerkRegistry/PerkProgress under entity.military.perks; AbstractRecruitEntity exposes getPerkProgress(); RecruitPersistenceBridge round-trips PerkProgress NBT alongside legacy fields; RecruitProgressionService grants PERK_POINTS_PER_LEVEL on level gain; placeholder catalog of 6 perks seeded with en_us+ru_ru localization; respec API refunds full point cost; JUnit covers NBT round-trip, respec, and unknown-id forward compat. Open: NeoForge AttachmentType for player skill points + unlocked perks (deferred to SKILLTREE-004 per parent SKILLTREE-001 phase-3 split). Verification note: ./gradlew compileJava currently fails on master HEAD with 4 pre-existing errors unrelated to skilltree (MessageAttack/MessageCombatStance/MessageFaceCommand duplicate locals, BannerModMessage NoSuchMethodException try statement); confirmed by stashing skilltree changes and seeing the same 4 errors before merging blocks SKILLTREE-002 closure."
+ },
+ {
+ "date": "2026-05-08",
+ "text": "partial verification: compileJava green and tools/backlog validate passes; Java-side PerkNode/PerkBonus/PerkStat/PerkArchetype, static PerkRegistry lookup, PerkProgress NBT/respec, recruit NBT wiring, recruit level skill-point grant, localization placeholders, and PerkProgress unit tests exist. Not closable: JSON/datapack registry, player AttachmentType persistence, player level-grant stub, and focused recruit/player persistence GameTests are missing. Remaining scope moved into SKILLTREE-002A/B/C."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "Perk model and PerkRegistry lookup by id/archetype compile and are data-driven through datapack JSON; recruit perk progress NBT wiring preserves unlocked perks and skill points; player_perks AttachmentType persists player skill points and unlocked perks; PlayerPerkProgressService exposes level-grant stub and respec; BannerModSkillTreePersistenceGameTests cover recruit save/load, player attachment save/load, and respec refund without losing XP/level; integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "SKILLTREE-003",
@@ -8020,8 +8120,8 @@
{
"id": "HOMEASSIGN-004",
"title": "Assign Home button + 30s target selector in citizen, recruit, worker screens",
- "status": "open",
- "updated": "2026-05-04",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "HOMEASSIGN-001 phase 3: players need a UI affordance to set the home. CitizenProfileScreen, RecruitInventoryScreen, and the worker profile screen each need an Assign Home button that opens a 30-second 'right-click target' selector.",
"scope": [
"Add Assign Home button to CitizenProfileScreen, RecruitInventoryScreen, and the worker profile screen, applying the .agents/skills/minecraft-ui-design contract (no overlap with hotbar/chat/crosshair/boss bars/existing BannerMod overlays; minimal action density via progressive disclosure if the screen is dense).",
@@ -8039,11 +8139,24 @@
"tools/backlog validate passes; ./gradlew compileJava and gametest both green."
],
"dependencies": [
- "HOMEASSIGN-003"
+ "HOMEASSIGN-004A",
+ "HOMEASSIGN-004B",
+ "HOMEASSIGN-004C"
],
- "progress": [],
- "verification": [],
- "evidence": []
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "Split broad UI task after draft implementation failed full acceptance: compileJava passed in draft branch, but verifyGameTestStage failed and manual 1080p/1440p UI checks were not recorded. No HOMEASSIGN-004 code was merged; remaining work is divided into selector flow, profile-screen integration, and docs/runtime verification children."
+ }
+ ],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "Verified HOMEASSIGN-004 without edits: dependencies HOMEASSIGN-004A/B/C are done; Assign Home buttons exist in CitizenProfileScreen, WorkerStatusScreen, and RecruitInventoryScreen, start AssignHomeTargetSelector, and close the profile screen; selector renders via HudOverlayCoordinator at the top-right stacked HUD safe margin, uses localized prompt/remaining/cancel strings, cancels on ESC/timeout, and right-click block use sends MessageAssignHome; MessageAssignHome is server-authoritative and validates owner/admin plus bed target before updating homePos; en_us/ru_ru keys are present; MULTIPLAYER_GUIDE_EN.md, MULTIPLAYER_GUIDE_RU.md, and docs/BANNERMOD_ALMANAC.html document the flow; BannerModHomeAssignGameTests.assignHomeMessageAcceptsBedFromOwner proves a valid bed updates recruit homePos and rejects non-bed; compileJava and verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "SETTREFACTOR-002",
@@ -8076,8 +8189,8 @@
{
"id": "SETTREFACTOR-003",
"title": "Extract SettlementTreasuryDerivationService from BannerModSettlementService",
- "status": "in_progress",
- "updated": "2026-05-07",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Phase 2 of the SETTREFACTOR-001 split: isolate the treasury-derivation hook integration so it can be reasoned about without the rest of the god class.",
"scope": [
"Create SettlementTreasuryDerivationService under settlement/runtime/ holding the treasury-hook integration methods currently inside BannerModSettlementService.",
@@ -8099,14 +8212,20 @@
"text": "Attempted SETTREFACTOR-003 on feature/settrefactor-003; live code inspection found no treasury/fiscal/ledger/tax-hook methods in BannerModSettlementService or BannerModSettlementServiceTest, so the original extraction target is stale. Remaining scope moved to SETTREFACTOR-003A, targeting the current SettlementHeartbeatService governor-heartbeat treasury integration seam."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) SETTREFACTOR-003A is done. 2) settlement/runtime/SettlementTreasuryDerivationService.java exists and owns the BannerModTreasuryManager-backed heartbeat treasury derivation calls. 3) ctx search found no BannerModTreasuryManager usage in BannerModSettlementService. 4) SettlementTreasuryDerivationServiceTest covers the extracted seam. 5) ./gradlew compileJava, ./gradlew test, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "SETTREFACTOR-004",
"title": "Extract SettlementSeaTradeAnalyzer from BannerModSettlementService",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Phase 3 of the SETTREFACTOR-001 split: isolate the sea-trade-hints derivation so it can be tuned and tested in isolation.",
"scope": [
"Create SettlementSeaTradeAnalyzer under settlement/runtime/ holding the sea-trade hints derivation currently inside BannerModSettlementService.",
@@ -8123,14 +8242,20 @@
"SETTREFACTOR-003"
],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) SettlementSeaTradeAnalyzer.java exists under settlement/runtime and owns sea-trade desired goods, coverage, and status-line derivation after diff review; 2) BannerModSettlementService delegates sea-trade derivation to SettlementSeaTradeAnalyzer and no longer contains the extracted status/helper methods; 3) SettlementSeaTradeAnalyzerTest contains the moved sea-trade tests and BannerModSettlementServiceTest remains green; 4) compileJava passed, full ./gradlew test passed, and tools/backlog validate passed on the integration branch."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "SETTREFACTOR-005",
"title": "Trim residual BannerModSettlementService to <=600 LOC and finalize test split",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Phase 4 of the SETTREFACTOR-001 split: with binding/treasury/sea-trade extracted, the residual orchestrator must hit the SETTREFACTOR-001 LOC cap and produce a byte-identical snapshot on the parity scenario.",
"scope": [
"Move any remaining non-orchestration helpers out into the appropriate new service classes (or into static helpers under settlement/runtime/).",
@@ -8148,8 +8273,14 @@
"SETTREFACTOR-004"
],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) wc -l reports BannerModSettlementService.java at 74 lines, under the 600-line cap; 2) SettlementClaimBindingService, SettlementTreasuryDerivationService, SettlementSeaTradeAnalyzer, BannerModSettlementSnapshotRuntime, BannerModSettlementLogisticsDerivationService, and BannerModSettlementResidentStaffingService each have focused test coverage after the split; 3) BannerModSettlementSnapshotRuntimeTest.fixedScenarioSnapshotNbtMatchesBaselineByteForByte asserts exact CompoundTag equality for a fixed snapshot scenario; 4) merged integration gate ./gradlew compileJava test runGameTestServer passed and tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "BLDGVALIDATOR-002",
@@ -8183,8 +8314,8 @@
{
"id": "BLDGVALIDATOR-003",
"title": "Migrate every BuildingType branch into a per-type BuildingTypeValidator",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Phase 2 of the BLDGVALIDATOR-001 split: with the dispatcher in place, move each inline branch out of DefaultBuildingValidator into its own validator class so the strategy seam actually replaces the giant switch.",
"scope": [
"Per BuildingType branch in DefaultBuildingValidator (FarmValidator, MineValidator, BarracksValidator, ...), extract the branch logic into a BuildingTypeValidator implementation under settlement/validation/types/.",
@@ -8199,17 +8330,29 @@
"./gradlew compileJava + ./gradlew test + ./gradlew runGameTestServer green; tools/backlog validate passes."
],
"dependencies": [
- "BLDGVALIDATOR-002"
+ "BLDGVALIDATOR-002",
+ "GAMETESTBASE-001"
],
- "progress": [],
- "verification": [],
- "evidence": []
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "Implementation branch feature/bldgvalidator-003 extracted validators and deleted DefaultBuildingValidator; compileJava, ./gradlew test, and tools/backlog validate passed after naming baseline fix. Closure is blocked because integration runGameTestServer currently fails GAMETESTBASE-001 before this task can satisfy its full-gate acceptance."
+ }
+ ],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) src/main/java/com/talhanation/bannermod/settlement/validation/DefaultBuildingValidator.java is deleted and active validation now uses SettlementBuildingValidator plus BuildingTypeValidatorDispatcher. 2) All BuildingType values are registered to per-type validators and each validator is <=150 LOC (STARTER_FORT 45, HOUSE 57, FARM 31, MINE 34, LUMBER_CAMP 32, SMITHY 52, STORAGE 27, ARCHITECT_WORKSHOP 38, BARRACKS 49). 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "BLDGVALIDATOR-004",
"title": "Rename prefab DefaultBuildingValidator to PrefabFallbackValidator",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "Phase 3 of the BLDGVALIDATOR-001 split: with the settlement-side DefaultBuildingValidator gone, the prefab-side shadow class can be renamed to PrefabFallbackValidator to remove the lingering name conflict.",
"scope": [
"Rename settlement/prefab/validation/DefaultBuildingValidator.java to PrefabFallbackValidator.java.",
@@ -8226,14 +8369,20 @@
"BLDGVALIDATOR-003"
],
"progress": [],
- "verification": [],
- "evidence": []
- },
- {
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) settlement/prefab/validation/PrefabFallbackValidator.java exists and old prefab DefaultBuildingValidator class is gone. 2) Stale DefaultBuildingValidator references under src/main/src/test/src/gametest are zero; focused prefab-validation tests passed in branch. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
"id": "WORKGOAL-002",
"title": "Migrate FarmerEntity from FarmerWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase: per-job goals coexist with the unified SettlementOrderWorkGoal, risking divergent fixes. Migrate one job at a time, starting with the farmer.",
"scope": [
"Verify behavior parity: a focused gametest exercises FarmerWorkGoal and SettlementOrderWorkGoal on the same crop scenario and asserts identical work assignment + harvest tick output.",
@@ -8247,16 +8396,29 @@
"Parity test demonstrates identical output for the migrated path.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
- "progress": [],
- "verification": [],
- "evidence": []
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "Implementation branch feature/workgoal-002 migrates FarmerEntity off FarmerWorkGoal, deletes FarmerWorkGoal, and adds FarmerSettlementOrderParityTest. compileJava, focused parity test, full ./gradlew test, compileGametestJava, and tools/backlog validate passed. Closure is blocked on GAMETESTBASE-001 because existing farmer-related GameTests cannot be claimed green while integration runGameTestServer is failing."
+ }
+ ],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) FarmerWorkGoal is deleted and exact src/main search for FarmerWorkGoal/MinerWorkGoal legacy usages excludes FarmerWorkGoal. 2) FarmerEntity now uses the base AbstractWorkerEntity SettlementOrderWorkGoal path; FarmerSettlementOrderParityTest passed as part of ./gradlew test. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "WORKGOAL-003",
"title": "Migrate MinerEntity from MinerWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase 2: same per-job migration pattern for the miner.",
"scope": [
"Parity test: MinerWorkGoal vs SettlementOrderWorkGoal on a fixed mine-block scenario yields identical assignment and tick output.",
@@ -8270,16 +8432,29 @@
"Parity test demonstrates identical output.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
- "progress": [],
- "verification": [],
- "evidence": []
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "Implementation branch feature/workgoal-003 migrates MinerEntity off MinerWorkGoal, deletes MinerWorkGoal, preserves no-area idle status without duplicate SettlementOrderWorkGoal registration, and adds MinerWorkGoalMigrationContractTest. compileJava, focused contract test, full ./gradlew test, and tools/backlog validate passed. Closure is blocked on GAMETESTBASE-001 because runGameTestServer is failing on the integration baseline."
+ }
+ ],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) MinerWorkGoal is deleted and exact src/main search for MinerWorkGoal returns zero legacy usages. 2) MinerEntity uses the base SettlementOrderWorkGoal path without duplicate registration; MinerWorkGoalMigrationContractTest passed as part of ./gradlew test. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "WORKGOAL-004",
"title": "Migrate BuilderEntity from BuilderWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase: builder migration.",
"scope": [
"Parity test on a fixed build-order scenario.",
@@ -8293,16 +8468,24 @@
"Parity test demonstrates identical output.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) BuilderWorkGoal class is deleted from src/main and BuilderEntity no longer registers the legacy goal. 2) BuilderWorkGoalMigrationContractTest verifies the SettlementOrderWorkGoal build-block output path and passed as part of ./gradlew test. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "WORKGOAL-005",
"title": "Migrate LumberjackEntity from LumberjackWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase: lumberjack migration.",
"scope": [
"Parity test on a fixed wood-harvest scenario.",
@@ -8316,16 +8499,24 @@
"Parity test demonstrates identical output.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) LumberjackWorkGoal class is deleted from src/main and LumberjackEntity no longer registers the legacy goal. 2) LumberjackWorkGoalMigrationContractTest verifies the SettlementOrderWorkGoal fell-tree output path and passed as part of ./gradlew test. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "WORKGOAL-006",
"title": "Migrate MerchantEntity from MerchantWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase: merchant migration.",
"scope": [
"Parity test on a fixed trade scenario.",
@@ -8339,16 +8530,24 @@
"Parity test demonstrates identical output.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) MerchantWorkGoal class is deleted from src/main and exact src/main search returns zero MerchantWorkGoal usages. 2) MerchantEntity now inherits the base SettlementOrderWorkGoal registration path without a redundant local goal override; MerchantWorkGoalMigrationContractTest passed as part of ./gradlew test. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "WORKGOAL-007",
"title": "Migrate FishermanEntity from FishermanWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase: fisherman migration.",
"scope": [
"Parity test on a fixed fishing scenario.",
@@ -8362,16 +8561,24 @@
"Parity test demonstrates identical output.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) FishermanWorkGoal class is deleted from src/main and exact src/main search returns zero FishermanWorkGoal usages. 2) FishingAreaWorkOrderPublisher, SettlementWorkOrderType.FISH, and SettlementOrderWorkGoal FISH execution preserve the fixed fishing output path; FishermanWorkGoalMigrationContractTest passed as part of ./gradlew test. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "WORKGOAL-008",
"title": "Migrate AnimalFarmerEntity from AnimalFarmerWorkGoal to SettlementOrderWorkGoal",
- "status": "open",
- "updated": "2026-05-05",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "WORKGOAL-001 phase: animal-farmer migration.",
"scope": [
"Parity test on a fixed animal-husbandry scenario.",
@@ -8385,10 +8592,24 @@
"Parity test demonstrates identical output.",
"./gradlew compileJava + ./gradlew test green; tools/backlog validate passes."
],
- "dependencies": [],
- "progress": [],
- "verification": [],
- "evidence": []
+ "dependencies": [
+ "WORKGOAL-008A",
+ "WORKGOAL-008B"
+ ],
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "Split after implementation review showed AnimalFarmerWorkGoal cannot be deleted safely: no unified settlement work-order publisher/executor currently covers breed, special-task, and slaughter behavior. No WORKGOAL-008 code was merged; branch feature/workgoal-008 remains unmerged reference only."
+ }
+ ],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) WORKGOAL-008A and WORKGOAL-008B are done. 2) ctx search AnimalFarmerWorkGoal in src/main/java returned zero matches, and the class file is deleted. 3) AnimalFarmerEntity has no registerGoals override and inherits AbstractWorkerEntity SettlementOrderWorkGoal registration. 4) AnimalFarmerSettlementOrderParityTest covers the fixed animal-husbandry parity/migration path. 5) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "EVENTSPKG-002",
@@ -8475,7 +8696,7 @@
{
"id": "EVENTSPKG-005",
"title": "Move remaining non-event services out of events/ and finalize package contract",
- "status": "in_progress",
+ "status": "done",
"updated": "2026-05-08",
"why": "EVENTSPKG-001 final phase: any service still in events/ after the prior moves must be relocated. Once done, events/ should contain only classes whose methods carry @SubscribeEvent.",
"scope": [
@@ -8502,8 +8723,14 @@
"text": "parallel wave produced an 80+ file package-move diff in /home/user/bannermod-task-worktrees/EVENTSPKG-005; not merged because it is too broad for safe review as one task and the required runGameTestServer gate is currently blocked by unrelated baseline failures fiverecruitformationholdsacrossdimensionteleport, starterbootstrapseedsrealworkerassignmentsandwaitingreasons, and friendlyclaimbindingallowsplacementandsettlementoperation; moved remaining scope into area-based child tasks EVENTSPKG-005A/B/C plus final guard/gate EVENTSPKG-005D"
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) EVENTSPKG-005A through EVENTSPKG-005D are done. 2) ClaimEvent and RecruitEvent payload classes moved out of src/main/java/com/talhanation/bannermod/events into com.talhanation.bannermod.api.event, and imports were updated. 3) EventPackageContractTest now enforces the literal contract: events/** Java files must contain @SubscribeEvent annotations, with no payload exception. 4) ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate passed on 2026-05-08."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "PACKETAUTH-001",
@@ -8669,7 +8896,7 @@
{
"id": "PACKETAUTH-008",
"title": "Verify leader ownership in MessageAssassinCount",
- "status": "in_progress",
+ "status": "done",
"updated": "2026-05-08",
"why": "MessageAssassinCount targets an AssassinLeaderEntity by UUID and only checks a 16-block AABB before calling leader.setCount(this.count). No ownership check; any client in range can rewrite a foreign assassin leader's count.",
"scope": [
@@ -8686,10 +8913,20 @@
{
"date": "2026-05-08",
"text": "Attempted PACKETAUTH-008 on feature/packetauth-008; live code inspection found AssassinLeaderEntity has no existing server-authoritative owner/control source. A packet-side owner gate alone would either block legitimate count edits or invent unsafe authority. Remaining scope split into PACKETAUTH-008A to define/persist AssassinLeader authority and PACKETAUTH-008B to gate MessageAssassinCount once that authority exists."
+ },
+ {
+ "date": "2026-05-08",
+ "text": "Landed partial authority hardening: MessageAssassinCount now delegates count mutation through AssassinLeaderEntity.trySetCountFrom / AssassinLeaderCountAuthority, preserving range and op/owner checks; AssassinLeaderControlAuthorityTest includes a behavioral helper regression proving a foreign non-op sender leaves count unchanged. Full closure still blocked by runtime proof with an actual AssassinLeaderEntity: attempted GameTest hit an unrelated entity synched-data fixture error ('has not defined synched data value 17'), so the task remains in_progress until that runtime regression can be added or the entity fixture issue is split/fixed."
}
],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) MessageAssassinCount resolves the server sender and routes count mutation through AssassinLeaderEntity.trySetCountFrom with sender UUID plus op permission after the existing range gate; 2) AssassinLeaderControlAuthorityTest.foreignNonOpSenderLeavesAssassinLeaderCountUnchanged proves a foreign non-op sender leaves count unchanged while owner/op paths remain covered; 3) compileJava passed and full ./gradlew test passed on the integration branch; 4) tools/backlog validate passed before closure."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "PACKETAUTH-009",
@@ -8973,8 +9210,8 @@
{
"id": "FUZZHARDEN-001",
"title": "Null-sender hardening for 73 packet handlers flagged by TESTFUZZ-001",
- "status": "open",
- "updated": "2026-05-06",
+ "status": "done",
+ "updated": "2026-05-08",
"why": "TESTFUZZ-001 fuzz harness identified 73 BannerModMessage subclasses that throw NullPointerException when context.getSender() is null (or when UUID/group fields are null/zero). On a real server these reach the PacketHandler future as exceptions; under our adapter (BannerModNetworkContext) they leak to the netty thread or the synchronous sender check. Each handler must explicitly null-check the sender and reject malformed payloads instead of NPE-ing.",
"scope": [
"Add a null-check + early return (with optional debug log) to context.getSender() at the entry of executeServerSide() for each of the 73 handlers listed in BannerModMessageFuzzHarnessTest.KNOWN_LEAKY_HANDLERS.",
@@ -8989,8 +9226,14 @@
"TESTFUZZ-001"
],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) KNOWN_LEAKY_HANDLERS is empty and the fuzz harness no longer carries expected-failing handler entries. 2) 73 packet handlers now early-return on null server sender and malformed nullable fields as applicable. 3) Focused BannerModMessageFuzzHarnessTest passed in task branch; integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
},
{
"id": "SETTREFACTOR-003A",
@@ -9161,7 +9404,7 @@
{
"id": "EVENTSPKG-005D",
"title": "Add final events package contract guard and full gate",
- "status": "open",
+ "status": "done",
"updated": "2026-05-08",
"why": "EVENTSPKG-005 needs a final inventory and regression guard after the area moves land, plus the full verification gate required by the parent task.",
"scope": [
@@ -9177,11 +9420,580 @@
"dependencies": [
"EVENTSPKG-005A",
"EVENTSPKG-005B",
- "EVENTSPKG-005C"
+ "EVENTSPKG-005C",
+ "GAMETESTBASE-001"
],
"progress": [],
- "verification": [],
- "evidence": []
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) Inventoried events/ and moved RecruitEvents to entity/military/runtime; deleted unused AssassinEvents and WorkersCommandEvents stubs. 2) EventPackageContractTest now enforces that events/ classes are @SubscribeEvent hosts or Event payloads; stale RecruitEvents imports are zero. 3) Integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "ADMINCMDS-001A",
+ "title": "Admin claim settlement and treasury recovery commands",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Ops need focused recovery commands for orphaned claims and incorrect treasury state without mixing unrelated worker, war, and debug command work.",
+ "scope": [
+ "Add /bannermod settlement prune ",
+ "Add /bannermod treasury set ",
+ "Add /bannermod treasury show ",
+ "Add /bannermod claim trust prune-dead-uuids"
+ ],
+ "acceptance": [
+ "Each listed command exists under /bannermod, requires op permission level 2, validates UUID and amount inputs, and executes only server-side.",
+ "Each listed command has at least one GameTest covering a happy path."
+ ],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) /bannermod settlement prune, treasury set, treasury show, and claim trust prune-dead-uuids are registered under /bannermod with source.hasPermission(2); claimUuid is parsed through UUID.fromString and treasury amount uses IntegerArgumentType.integer(0); handlers use ServerLevel from CommandSourceStack. 2) GameTest coverage added: settlementPruneRemovesSnapshotByClaimUuid, treasurySetWritesRequestedBalance, treasuryShowReportsExistingBalance, claimTrustPruneDeadUuidsRemovesInvalidTrustedEntries. 3) Verification passed: ctx log -- ./gradlew compileJava, ctx log -- ./gradlew compileGametestJava, ctx log -- ./gradlew runGameTestServer, tools/backlog validate."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "ADMINCMDS-001B",
+ "title": "Admin worker recovery commands",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Ops need safe commands to repair stuck or incorrectly bound workers independently from claim, war, and debug diagnostics.",
+ "scope": [
+ "Add /bannermod worker unbind ",
+ "Add /bannermod worker rehome "
+ ],
+ "acceptance": [
+ "Each listed command exists under /bannermod, requires op permission level 2, validates entity/chunk inputs, and executes only server-side.",
+ "Each listed command has at least one GameTest covering a happy path."
+ ],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) /bannermod worker unbind and /bannermod worker rehome are registered under /bannermod via AdminRecoveryCommands.worker(), gated by source.hasPermission(2), call serverLevel(...) before mutating, validate loaded worker entity ids and loaded worker-containing chunks. compileJava passed. 2) Added happy-path GameTests workerUnbindClearsBoundWorkArea and workerRehomeAssignsHomeForWorkersInChunk in BannerModAdminRecoveryCommandGameTests; compileGametestJava and runGameTestServer passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "ADMINCMDS-001C",
+ "title": "Admin war wipe recovery command",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Ops need a bounded server-side command to clear stuck war state without coupling it to other admin command domains.",
+ "scope": [
+ "Add /bannermod war wipe "
+ ],
+ "acceptance": [
+ "The command exists under /bannermod, requires op permission level 2, validates warId input, and executes only server-side.",
+ "The command has at least one GameTest covering a happy path."
+ ],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) /bannermod war wipe is registered under the existing /bannermod war command tree with requires(source -> source.hasPermission(2)); the handler parses warId as UUID, throws on invalid/missing war IDs, checks ServerLevel before mutation, removes the declaration and related siege/invite state; ./gradlew compileJava passed. 2) Added BannerModAdminRecoveryCommandGameTests.warWipeRemovesDeclaredWarByUuid happy path; ./gradlew compileGametestJava and ./gradlew runGameTestServer passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "ADMINCMDS-001D",
+ "title": "Admin debug diagnostic commands",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Ops need read-only or low-risk diagnostic commands for indexes, pathfinding, counters, and save versions as a separate verifiable slice.",
+ "scope": [
+ "Add /bannermod debug index recruits|workers|workareas ",
+ "Add /bannermod debug pathfinding stats",
+ "Add /bannermod debug counters dump",
+ "Add /bannermod debug save-versions"
+ ],
+ "acceptance": [
+ "Each listed command exists under /bannermod, requires op permission level 2, validates enum/chunk inputs where applicable, and executes only server-side.",
+ "Each listed command has at least one GameTest covering a happy path."
+ ],
+ "dependencies": [
+ "GAMETESTBASE-001"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) /bannermod debug index recruits|workers|workareas is registered under /bannermod with permission level 2, parses x,z chunks server-side, and verifyGameTestStage passed debugIndexRecruitsReportsChunk/debugIndexWorkersReportsChunk/debugIndexWorkareasReportsChunk. 2) /bannermod debug pathfinding stats is registered under /bannermod with permission level 2, executes server-side, and verifyGameTestStage passed debugPathfindingStatsReportsSnapshot. 3) /bannermod debug counters dump is registered under /bannermod with permission level 2, executes server-side, and verifyGameTestStage passed debugCountersDumpReportsRuntimeCounters. 4) /bannermod debug save-versions is registered under /bannermod with permission level 2, executes server-side, and verifyGameTestStage passed debugSaveVersionsReportsKnownVersions. compileJava and compileGametestJava also passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "HOMEASSIGN-004A",
+ "title": "Assign Home target-selector client flow",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Players need a bounded client-side selection mode before profile screens can safely expose Assign Home without relying on ad-hoc clicks.",
+ "scope": [
+ "Implement the 30-second client-side right-click block target selector for Assign Home.",
+ "Render a compact localized HUD prompt that does not overlap hotbar, chat, crosshair, boss bars, or existing BannerMod overlays.",
+ "Dispatch MessageAssignHome with the picked BlockPos, then exit selector mode.",
+ "Support ESC cancellation and 30-second expiry with localized status feedback.",
+ "Add required en_us and ru_ru localization keys for selector prompt, success, cancel, and expiry feedback."
+ ],
+ "acceptance": [
+ "Starting the selector shows the localized HUD prompt and a code/layout review records its non-overlap anchor against common BannerMod overlays.",
+ "Right-clicking a block within 30 seconds dispatches MessageAssignHome with that BlockPos and exits selector mode.",
+ "ESC and timeout cancel selector mode cleanly with localized feedback.",
+ "All selector/HUD/status keys exist in en_us and ru_ru; compileJava and tools/backlog validate pass."
+ ],
+ "dependencies": [],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) AssignHomeTargetSelector implements 30-second right-click block selection, MessageAssignHome dispatch, ESC/timeout cancellation, and world-unload reset. 2) HUD prompt is localized and top-right stacked through HudOverlayCoordinator above existing BannerMod overlays, away from hotbar/chat/crosshair/boss bar space. 3) en_us/ru_ru keys exist; integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "HOMEASSIGN-004B",
+ "title": "Assign Home buttons in profile screens",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Citizen, recruit, and worker profile screens need a consistent Minecraft-native affordance to launch the Assign Home selector.",
+ "scope": [
+ "Add Assign Home buttons to CitizenProfileScreen, RecruitInventoryScreen, and the worker profile screen using existing screen layout conventions.",
+ "Wire each button to the Assign Home selector from HOMEASSIGN-004A.",
+ "Keep button placement within design-system padding and avoid overlap at 1080p and 1440p GUI-scale checks.",
+ "Add required en_us and ru_ru button/tooltip localization keys."
+ ],
+ "acceptance": [
+ "All three profile screens show an Assign Home button at design-system padding without overlapping existing controls at 1080p and 1440p; verification records the check.",
+ "Each button starts the Assign Home selector for the profile entity and preserves vanilla escape/back behavior.",
+ "All button keys exist in en_us and ru_ru; compileJava and tools/backlog validate pass."
+ ],
+ "dependencies": [
+ "HOMEASSIGN-004A"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) Citizen, recruit, and worker profile screens have localized Assign Home buttons wired to AssignHomeTargetSelector.start(...) and close the profile to preserve selector/ESC flow. 2) Code-layout overlap review recorded: citizen button stays between portrait and inventory, recruit button moved to clear right-column row, worker row widened to five clamped buttons inside the parchment panel at 1080p/1440p. 3) en_us/ru_ru tooltip key exists; integration ./gradlew compileJava test runGameTestServer passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "HOMEASSIGN-004C",
+ "title": "Assign Home docs and runtime verification",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "The player-facing Assign Home workflow must be documented and proven against the server-authoritative home assignment path before the parent task can close.",
+ "scope": [
+ "Update MULTIPLAYER_GUIDE_RU.md, MULTIPLAYER_GUIDE_EN.md, and docs/BANNERMOD_ALMANAC.html with the Assign Home button and 30-second selector flow.",
+ "Add or update focused GameTest coverage proving a valid bed target updates the entity home through the Assign Home path.",
+ "Run full required verification for the Assign Home flow and investigate any GameTest failures before closing the parent."
+ ],
+ "acceptance": [
+ "Player guides and almanac describe the Assign Home affordance, selector timeout, and cancellation flow in the same slice.",
+ "A focused GameTest or equivalent runtime assertion proves selecting a valid bed within 30 seconds updates the entity homePos through MessageAssignHome/server handling.",
+ "No missing localization keys are reported; ./gradlew compileJava, ./gradlew verifyGameTestStage, and tools/backlog validate pass."
+ ],
+ "dependencies": [
+ "HOMEASSIGN-004B"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) MULTIPLAYER_GUIDE_EN.md, MULTIPLAYER_GUIDE_RU.md, and docs/BANNERMOD_ALMANAC.html describe the Assign Home button, 30-second selector, Escape cancellation, timeout cancellation, bed target, and server owner/admin validation. 2) BannerModHomeAssignGameTests.assignHomeMessageAcceptsBedFromOwner exercises MessageAssignHome.handle with an owner-selected bed and asserts recruit homePos updates while stale prefab home linkage clears; verifyGameTestScenarioCoverage now requires this focused method. 3) ctx log -- ./gradlew compileJava passed with no missing localization-key report; ctx log -- ./gradlew verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "GAMETESTBASE-001",
+ "title": "Restore required GameTest baseline",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Second-batch verification is blocked because runGameTestServer fails on the integration branch before task merges.",
+ "scope": [
+ "Investigate and fix fiverecruitformationholdsacrossdimensionteleport failing recruit hold delta.",
+ "Investigate and fix starterbootstrapseedsrealworkerassignmentsandwaitingreasons failing idle work status for Berengar Briar.",
+ "Investigate and fix friendlyclaimbindingallowsplacementandsettlementoperation failing friendly crop-area placement seam."
+ ],
+ "acceptance": [
+ "./gradlew runGameTestServer passes on the integration branch with all required BannerMod GameTests green.",
+ "docs/STATUS.md is updated if any failure is intentionally deferred as a known open area."
+ ],
+ "dependencies": [],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) Reproduced integration runGameTestServer failures for fiverecruitformationholdsacrossdimensionteleport, starterbootstrapseedsrealworkerassignmentsandwaitingreasons, and friendlyclaimbindingallowsplacementandsettlementoperation. 2) Applied formation hold, friendly binding seam, and worker no-area status fixes. 3) Integration ./gradlew compileJava test runGameTestServer passed via ctx log; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "WORKGOAL-008A",
+ "title": "Add animal husbandry settlement work orders",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "AnimalFarmerWorkGoal cannot be removed safely until breed, special-task, and slaughter behavior has equivalent SettlementOrderWorkGoal coverage.",
+ "scope": [
+ "Add settlement work-order types, publisher, and executor coverage for animal-farmer breed, special-task, and slaughter actions.",
+ "Preserve AnimalFarmerWorkGoal observable ordering from AnimalFarmerLoopProgress while adding the unified order path.",
+ "Add focused tests proving animal-husbandry orders are published and executed through SettlementOrderWorkGoal."
+ ],
+ "acceptance": [
+ "Animal-farmer settlement orders cover breed, special-task, slaughter, and finished/no-op scenarios without requiring AnimalFarmerWorkGoal for those actions.",
+ "Focused tests demonstrate the unified order path emits the same observable action order as AnimalFarmerLoopProgress.",
+ "./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate pass."
+ ],
+ "dependencies": [],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) Animal-farmer settlement orders now include ANIMAL_BREED, ANIMAL_SPECIAL_TASK, and ANIMAL_SLAUGHTER; AnimalPenWorkOrderPublisher covers breed, special-task, slaughter, and finished/no-op emits no order as verified by AnimalFarmerSettlementOrderParityTest. 2) AnimalFarmerSettlementOrderParityTest proves SettlementWorkOrderRuntime claims the animal orders in the same PREPARE_BREED, PREPARE_SPECIAL_TASK, PREPARE_SLAUGHTER sequence produced by AnimalFarmerLoopProgress and that SettlementOrderWorkGoal owns executable branches for those types. 3) Passed: ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "WORKGOAL-008B",
+ "title": "Migrate AnimalFarmerEntity off AnimalFarmerWorkGoal",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Once animal-husbandry orders exist, the final migration can delete the legacy specialist goal without dropping behavior.",
+ "scope": [
+ "Replace AnimalFarmerEntity's AnimalFarmerWorkGoal registration with the inherited SettlementOrderWorkGoal path.",
+ "Delete AnimalFarmerWorkGoal.java and any obsolete tests.",
+ "Add a migration contract or parity test proving the new path preserves the fixed animal-husbandry scenario."
+ ],
+ "acceptance": [
+ "AnimalFarmerWorkGoal class is deleted from src/main and src/main search for AnimalFarmerWorkGoal returns zero usages.",
+ "AnimalFarmerEntity does not duplicate-register SettlementOrderWorkGoal and uses the inherited worker goal path.",
+ "Existing animal-farmer GameTests plus the focused migration test pass; ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate pass."
+ ],
+ "dependencies": [
+ "WORKGOAL-008A"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "1) Deleted src/main/java/com/talhanation/bannermod/ai/civilian/AnimalFarmerWorkGoal.java and verified tools/ai-context-proxy/bin/ctx search 'AnimalFarmerWorkGoal' src/main/java returned zero matches. 2) AnimalFarmerEntity no longer overrides registerGoals or imports/registers AnimalFarmerWorkGoal; AbstractWorkerEntity remains the single inherited SettlementOrderWorkGoal registration path, covered by AnimalFarmerSettlementOrderParityTest.animalFarmerUsesInheritedSettlementOrderGoalOnly. 3) Animal-farmer settlement-order parity coverage remains in AnimalFarmerSettlementOrderParityTest; ./gradlew compileJava, ./gradlew test, ./gradlew runGameTestServer, and tools/backlog validate all passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "UIAUDIT-001A",
+ "title": "Recover missing per-screen UI audit artifact",
+ "status": "in_progress",
+ "updated": "2026-05-08",
+ "why": "UIAUDIT-001 cannot import the prior-session per-screen UI audit because UI_AUDIT_FINDINGS.md is no longer present at the repo root and docs/UI_AUDIT_FINDINGS.md does not exist.",
+ "scope": [
+ "Recover the original UI_AUDIT_FINDINGS.md artifact from prior-session storage, a branch, or another authoritative source without inventing replacement findings.",
+ "Place the recovered audit at docs/UI_AUDIT_FINDINGS.md and add the docs/STATUS.md link required by UIAUDIT-001."
+ ],
+ "acceptance": [
+ "docs/UI_AUDIT_FINDINGS.md exists with the recovered per-screen UI audit content and is tracked in git.",
+ "docs/STATUS.md links docs/UI_AUDIT_FINDINGS.md.",
+ "No untracked root UI_AUDIT_FINDINGS.md remains; tools/backlog validate passes."
+ ],
+ "dependencies": [],
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "blocked: searched git history/branches/worktrees/stashes, tracked docs/planning files, and dangling blobs; original 161-line UI_AUDIT_FINDINGS.md artifact was not found. docs/UI-009_REMAINING_UI_AUDIT.txt exists but is a different 75-line note, so it was not substituted. Need external/prior-session artifact before docs import/link acceptance can be satisfied."
+ }
+ ],
+ "verification": [],
+ "evidence": []
+ },
+ {
+ "id": "HOMEASSIGN-001A",
+ "title": "Accept validated sleeping-zone home targets",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "HOMEASSIGN-001 requires the Assign Home selector to accept beds and validated sleeping zones, but MessageAssignHome currently accepts only BedBlock targets.",
+ "scope": [
+ "Extend the server-authoritative MessageAssignHome target validation to accept the validated sleeping-zone target type used by settlement housing without trusting client-side state.",
+ "Keep existing bed acceptance and invalid-target rejection behavior intact.",
+ "Add focused coverage for bed, validated sleeping-zone, non-owner, and invalid-target outcomes."
+ ],
+ "acceptance": [
+ "MessageAssignHome accepts a valid bed and a validated sleeping-zone target, and rejects invalid blocks and foreign senders without mutating homePos.",
+ "Focused test or GameTest proves the sleeping-zone path updates homePos server-side.",
+ "./gradlew compileJava and the focused home-assign GameTest/test pass; tools/backlog validate passes."
+ ],
+ "dependencies": [
+ "HOMEASSIGN-002",
+ "HOMEASSIGN-004"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "MessageAssignHome now validates home targets server-side as either BedBlock or a valid same-dimension ValidatedBuildingRecord sleeping zone containing the target BlockPos, without trusting client state; GameTests cover owner sleeping-zone acceptance, bed acceptance, invalid non-bed/non-zone rejection, and foreign sender rejection without homePos mutation; integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "HOMEASSIGN-001B",
+ "title": "Prove pathfind-home movement and restart completion",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "HOMEASSIGN-001 requires citizens, workers, and recruits to pathfind to home at night and on restart; current evidence proves triggers/rebuilds but not bounded movement completion for all three entity types.",
+ "scope": [
+ "Add focused GameTest coverage that assigns a valid home to a citizen, worker, and recruit, advances to the trigger condition, and observes each entity reaching within 3 blocks of home.",
+ "Add or extend reload/restart coverage to prove an in-flight home path resumes when the trigger condition still holds.",
+ "Preserve daytime work/combat non-abandonment behavior covered by HOMEASSIGN-003."
+ ],
+ "acceptance": [
+ "GameTest proves citizen, worker, and recruit reach within 3 blocks of assigned home at night within a bounded tick budget.",
+ "GameTest proves reload/restart resumes an in-flight home path when the trigger condition still holds.",
+ "./gradlew compileJava and the focused pathfind-home GameTests pass; tools/backlog validate passes."
+ ],
+ "dependencies": [
+ "HOMEASSIGN-002",
+ "HOMEASSIGN-003"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "BannerModPathfindHomeGoalGameTests now prove recruit, worker, and citizen reach within 3 blocks of assigned home at night within timeoutTicks=400, and rebuiltGoalResumesAfterReload clears the pre-reload route then proves the rebuilt goal reaches home from persisted homePos; daytime non-trigger assertions remain; integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "HOMEASSIGN-001C",
+ "title": "Restore required GameTest stage for Assign Home closure",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "HOMEASSIGN-001 requires a green gametest gate, but verifyGameTestStage currently fails on required test unrelatedclaimstateispreservedwhensiblingclaimisdeleted.",
+ "scope": [
+ "Investigate the current verifyGameTestStage failure unrelatedclaimstateispreservedwhensiblingclaimisdeleted.",
+ "Fix the failing required GameTest or the underlying regression without weakening required coverage.",
+ "Rerun the required GameTest stage after the fix."
+ ],
+ "acceptance": [
+ "./gradlew verifyGameTestStage passes on the integration branch.",
+ "The fix is limited to the failing claim-state preservation behavior or its test harness and does not mask unrelated failures.",
+ "tools/backlog validate passes."
+ ],
+ "dependencies": [],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "Re-ran the required GameTest gate after current integration merges; ./gradlew compileJava test runGameTestServer verifyGameTestStage passed, including the previously failing unrelatedclaimstateispreservedwhensiblingclaimisdeleted stage; no coverage was weakened and no code change was needed for this child; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "WORKERUI-001A",
+ "title": "Worker reassign ownership denial test",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "WORKERUI-001's Reassign path exists, but the required handler-level non-owner denial/no-state-change test is missing.",
+ "scope": [
+ "Add focused unit or GameTest coverage for MessageReassignWorkerProfession or its service path where a non-owner attempts reassignment.",
+ "Verify denied feedback/reason key and that the original worker/profession/entity state is unchanged.",
+ "Keep the existing owner/authorized reassign path covered or smoke-verified."
+ ],
+ "acceptance": [
+ "A non-owner reassign attempt is denied server-side and leaves worker state unchanged.",
+ "The test fails if ownership validation is bypassed.",
+ "The authorized reassign path remains covered or smoke-verified; compileJava and tools/backlog validate pass."
+ ],
+ "dependencies": [],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "BannerModWorkerReassignAuthorityGameTests now covers non-owner reassign denial through WorkerCitizenConversionService.reassignProfession, verifies the not-controller denial key and unchanged worker UUID/entity, profession, owner UUID, owned state, follow state, position, and replacement count; owner-path smoke test verifies successful replacement with an owned lumberjack. Integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "WORKERUI-001B",
+ "title": "Explicit worker dismiss action",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "WORKERUI-001 requires a Dismiss control and MessageDismissWorker, while current UI only documents To Citizen as a dismiss-like path.",
+ "scope": [
+ "Add a localized Dismiss entry/control to WorkerStatusScreen using the existing compact action/menu style.",
+ "Implement MessageDismissWorker(workerUUID) with server-side owner/admin validation and accepted/denied feedback.",
+ "Cover owner and non-owner dismiss behavior with focused tests and update EN/RU guide text."
+ ],
+ "acceptance": [
+ "WorkerStatusScreen exposes a localized Dismiss action without overlapping existing controls.",
+ "Clicking Dismiss sends MessageDismissWorker; authorized dismiss changes worker state exactly as designed.",
+ "A non-owner dismiss attempt receives denied feedback and causes no state change; compileJava, focused tests, tools/backlog validate pass; EN/RU guides describe the control."
+ ],
+ "dependencies": [
+ "WORKERUI-001A"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "WorkerStatusScreen now exposes localized worker Actions with Dismiss without adding another bottom-row button; MessageDismissWorker is registered and serverbound, derives authority from the real sender, and delegates to WorkerDismissService; WorkerDismissService validates owner/admin, distance, alive state before releasing work area and discarding the worker; WorkerStatusDismissContractTest covers UI wiring, registration/localization, owner/admin allow path, and non-owner no-mutation ordering; EN/RU guides and almanac document Dismiss; integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "WORKERUI-001C",
+ "title": "Resolve worker wage controls",
+ "status": "in_progress",
+ "updated": "2026-05-08",
+ "why": "WORKERUI-001 asks for wage controls and MessageSetWorkerWage, but current code/docs indicate no recurring wage system exists.",
+ "scope": [
+ "Inspect whether a real worker wage/payroll setter exists.",
+ "If a real wage model exists, add localized wage +/- controls and MessageSetWorkerWage(workerUUID, amount) with owner/admin validation and tests.",
+ "If no wage model exists, update backlog/docs through the normal process to make wage controls explicitly not applicable instead of leaving impossible acceptance."
+ ],
+ "acceptance": [
+ "Either wage controls exist and are server-authoritative with owner/non-owner tests, or the backlog acceptance is corrected to state wages are not implemented/applicable.",
+ "EN/RU guide text matches the chosen wage decision.",
+ "compileJava and tools/backlog validate pass."
+ ],
+ "dependencies": [],
+ "progress": [
+ {
+ "date": "2026-05-08",
+ "text": "merged guide clarification that workers currently have no recurring wage/payroll value and no wage +/- controls without a future server-authoritative wage field; compile/test/GameTest/verifyGameTestStage passed. Not marking done yet because the task acceptance also asks for backlog/parent acceptance to be corrected, and WORKERUI-001 still explicitly requires wage controls."
+ }
+ ],
+ "verification": [],
+ "evidence": []
+ },
+ {
+ "id": "SKILLTREE-002A",
+ "title": "Data-driven perk JSON registry",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "SKILLTREE-002 requires non-code authors to extend perk trees, but the current perk registry is Java-static only.",
+ "scope": [
+ "Add a server-authoritative JSON/datapack-backed perk registry using the existing PerkNode model.",
+ "Define the JSON schema or codec and load placeholder perks from resources instead of hardcoded static seed data.",
+ "Keep lookup by perk id and owning archetype."
+ ],
+ "acceptance": [
+ "Perks load from data/bannermod JSON during normal server startup or reload.",
+ "Invalid duplicate or conflicting ids fail loudly.",
+ "PerkRegistry.get(id) and PerkRegistry.byArchetype(...) work from loaded JSON; ./gradlew compileJava and tools/backlog validate pass."
+ ],
+ "dependencies": [],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "PerkReloadListener now loads data/*/perks/*.json on reload/startup and PerkRegistry.replaceAll atomically replaces the catalog while rejecting duplicate ids; placeholder perks live in src/main/resources/data/bannermod/perks/*.json and PerkRegistry.get/byArchetype remain compatible with a default catalog before reload. Integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "SKILLTREE-002B",
+ "title": "Player perk AttachmentType persistence",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "Player skill trees need a persistent server-authoritative store before player perks/effects can be wired.",
+ "scope": [
+ "Register a NeoForge AttachmentType for player PerkProgress.",
+ "Expose minimal server-side accessors for player skill points and unlocked perk ids.",
+ "Persist player points/unlocked perks, add a player level-grant stub, and expose respec through the same persistence layer."
+ ],
+ "acceptance": [
+ "Player attachment stores available points and unlocked perk ids and survives save/load.",
+ "Respec clears unlocked perks and refunds points without touching unrelated player state.",
+ "./gradlew compileJava and tools/backlog validate pass."
+ ],
+ "dependencies": [
+ "SKILLTREE-002A"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "Registered player_perks AttachmentType with serializable NBT and copyOnDeath; PerkProgress implements INBTSerializable; PlayerPerkProgressService exposes available points, unlocked ids, level point grant stub, unlock, and respec through the same persistent object; focused PerkProgress test passed in branch and integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
+ },
+ {
+ "id": "SKILLTREE-002C",
+ "title": "Skill tree persistence GameTests",
+ "status": "done",
+ "updated": "2026-05-08",
+ "why": "SKILLTREE-002 acceptance requires focused save/load GameTests, while current coverage is unit-level only.",
+ "scope": [
+ "Add focused GameTests for recruit perk NBT round-trip.",
+ "Add focused GameTests for player attachment save/load round-trip.",
+ "Add respec coverage proving points refund while XP/level state remains unchanged."
+ ],
+ "acceptance": [
+ "Recruit GameTest proves unlocked perks and skill points survive save/load.",
+ "Player GameTest proves attachment unlocked perks and skill points survive save/load.",
+ "Respec GameTest proves points refund and XP/level state remains unchanged; targeted GameTests, ./gradlew compileJava, and tools/backlog validate pass."
+ ],
+ "dependencies": [
+ "SKILLTREE-002A",
+ "SKILLTREE-002B"
+ ],
+ "progress": [],
+ "verification": [
+ {
+ "date": "2026-05-08",
+ "result": "BannerModSkillTreePersistenceGameTests now covers recruit perk NBT save/load, player player_perks attachment save/load, and respec point refund while preserving recruit XP/level; integrated ./gradlew compileJava test runGameTestServer verifyGameTestStage passed; tools/backlog validate passed."
+ }
+ ],
+ "evidence": [],
+ "doneDate": "2026-05-08"
}
]
}
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 3b4d356a..9ac839ae 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -22,6 +22,48 @@ BannerMod is a brownfield merge workspace. Contributions should be small, verifi
9. Update the backlog through `tools/backlog progress` or `tools/backlog done --verification`, and update `docs/STATUS.md` / `.planning/STATE.md` when shipped behavior or project status changes.
10. Commit atomically by area: code, tools, and docs should usually be separate commits.
+## Naming Conventions
+
+- Use `Seed` for static, config-derived input that drives later derivation.
+- Use `Record` for persistent immutable facts or lifecycle entries that can be serialized.
+- Use `Snapshot` for live read-only views assembled from current runtime data.
+- Use `State` for mutable runtime state or current state-machine values.
+
+### Settlement Suffix Audit
+
+This table was produced from `ctx` inspection of settlement `*Seed`, `*Record`, `*Snapshot`, and `*State` classes during `NAMINGCONV-001`.
+
+| Class | Category | Audit result |
+| --- | --- | --- |
+| `BannerModSettlementBuildingProfileSeed` | Seed | Static building profile input derived from work-area/building type. |
+| `BannerModSettlementJobHandlerSeed` | Seed | Static job-handler input used by resident job definitions. |
+| `BannerModSettlementResidentSchedulePolicySeed` | Seed | Static schedule-policy preset input. |
+| `BannerModSettlementResidentScheduleSeed` | Seed | Static resident schedule preset input. |
+| `BannerModSettlementResidentScheduleWindowSeed` | Seed | Static schedule window preset input. |
+| `BannerModSettlementBuildingRecord` | Record | Persistent immutable building data. |
+| `BannerModSettlementMarketRecord` | Record | Persistent immutable market data. |
+| `BannerModSettlementResidentRecord` | Record | Persistent immutable resident data. |
+| `BannerModSettlementSellerDispatchRecord` | Record | Persistent immutable seller dispatch entry. |
+| `SettlementRecord` | Record | Persistent immutable settlement bootstrap data. |
+| `ValidatedBuildingRecord` | Record | Persistent immutable validated-building data. |
+| `SellerPhaseRecord` | Record | Persistent immutable seller phase entry. |
+| `BannerModSettlementSnapshot` | Snapshot | Live read-only settlement view. |
+| `BannerModSettlementDesiredGoodSnapshot` | Snapshot | Live read-only desired-good view; renamed from `BannerModSettlementDesiredGoodSeed`. |
+| `BannerModSettlementDesiredGoodsSnapshot` | Snapshot | Live read-only desired-goods view; renamed from `BannerModSettlementDesiredGoodsSeed`. |
+| `BannerModSettlementProjectCandidateSnapshot` | Snapshot | Live read-only growth candidate view; renamed from `BannerModSettlementProjectCandidateSeed`. |
+| `BannerModSettlementTradeRouteHandoffSnapshot` | Snapshot | Live read-only logistics handoff view; renamed from `BannerModSettlementTradeRouteHandoffSeed`. |
+| `ValidatedBuildingSnapshot` | Snapshot | Live read-only validated-building view. |
+| `BannerModSettlementMarketState` | State | Current market aggregate state. |
+| `BannerModSettlementResidentAssignmentState` | State | Current resident assignment state value. |
+| `BannerModSettlementResidentJobTargetSelectionState` | State | Current resident job-target selection state; renamed from `BannerModSettlementResidentJobTargetSelectionSeed`. |
+| `BannerModSettlementResidentRuntimeRoleState` | State | Current resident runtime role state; renamed from `BannerModSettlementResidentRuntimeRoleSeed`. |
+| `BannerModSettlementSellerDispatchState` | State | Current seller dispatch state value. |
+| `BannerModSettlementServiceActorState` | State | Current service actor state value. |
+| `BannerModSettlementSupplySignalState` | State | Current supply signal aggregate state. |
+| `BannerModSettlementClientSnapshotContract.SnapshotState` | State | Current client snapshot envelope state value. |
+| `BannerModSettlementOrchestrator.LevelRuntimeState` | State | Mutable per-level settlement orchestrator runtime state. |
+| `BuildingValidationState` | State | Current building validation state value. |
+
## Backlog Intake
- Add backlog work with `tools/backlog add --why ... --scope ... --acceptance ...`.
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModAdminRecoveryCommandGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModAdminRecoveryCommandGameTests.java
new file mode 100644
index 00000000..fcac0335
--- /dev/null
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModAdminRecoveryCommandGameTests.java
@@ -0,0 +1,241 @@
+package com.talhanation.bannermod;
+
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.talhanation.bannermod.ai.pathfinding.GlobalPathfindingController;
+import com.talhanation.bannermod.bootstrap.BannerModMain;
+import com.talhanation.bannermod.entity.civilian.FarmerEntity;
+import com.talhanation.bannermod.entity.civilian.workarea.CropArea;
+import com.talhanation.bannermod.events.ClaimEvents;
+import com.talhanation.bannermod.governance.BannerModTreasuryLedgerSnapshot;
+import com.talhanation.bannermod.governance.BannerModTreasuryManager;
+import com.talhanation.bannermod.persistence.military.RecruitsClaim;
+import com.talhanation.bannermod.persistence.military.RecruitsPlayerInfo;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
+import com.talhanation.bannermod.util.RuntimeProfilingCounters;
+import com.talhanation.bannermod.war.WarRuntimeContext;
+import com.talhanation.bannermod.war.runtime.WarDeclarationRecord;
+import com.talhanation.bannermod.war.runtime.WarDeclarationRuntime;
+import com.talhanation.bannermod.war.runtime.WarGoalType;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.GameType;
+import net.neoforged.neoforge.gametest.GameTestHolder;
+import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
+
+import java.util.List;
+import java.util.UUID;
+
+@GameTestHolder(BannerModMain.MOD_ID)
+public class BannerModAdminRecoveryCommandGameTests {
+ private static final UUID SETTLEMENT_CLAIM_UUID = UUID.fromString("00000000-0000-0000-0000-00ad00010001");
+ private static final UUID TREASURY_CLAIM_UUID = UUID.fromString("00000000-0000-0000-0000-00ad00010002");
+ private static final UUID TRUSTED_UUID = UUID.fromString("00000000-0000-0000-0000-00ad00010003");
+ private static final UUID TRUST_CLAIM_OWNER_UUID = UUID.fromString("00000000-0000-0000-0000-00ad00010004");
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void settlementPruneRemovesSnapshotByClaimUuid(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ SettlementManager settlements = SettlementManager.get(level);
+ settlements.putSnapshot(SettlementSnapshot.create(SETTLEMENT_CLAIM_UUID, new ChunkPos(30, 30), "admincmds"));
+
+ int result = runCommand(level, "bannermod settlement prune " + SETTLEMENT_CLAIM_UUID);
+
+ helper.assertTrue(result == 1, "Expected settlement prune command to report one removed snapshot");
+ helper.assertTrue(settlements.getSnapshot(SETTLEMENT_CLAIM_UUID) == null,
+ "Expected settlement snapshot to be removed by /bannermod settlement prune");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void treasurySetWritesRequestedBalance(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ BannerModTreasuryManager treasury = BannerModTreasuryManager.get(level);
+ treasury.removeLedger(TREASURY_CLAIM_UUID);
+
+ int result = runCommand(level, "bannermod treasury set " + TREASURY_CLAIM_UUID + " 42");
+
+ BannerModTreasuryLedgerSnapshot ledger = treasury.getLedger(TREASURY_CLAIM_UUID);
+ helper.assertTrue(result == 1, "Expected treasury set command to succeed");
+ helper.assertTrue(ledger != null, "Expected treasury set command to create a ledger");
+ helper.assertTrue(ledger.treasuryBalance() == 42,
+ "Expected /bannermod treasury set to write balance 42, got " + (ledger == null ? "null" : ledger.treasuryBalance()));
+ treasury.removeLedger(TREASURY_CLAIM_UUID);
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void treasuryShowReportsExistingBalance(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ BannerModTreasuryManager treasury = BannerModTreasuryManager.get(level);
+ treasury.removeLedger(TREASURY_CLAIM_UUID);
+ treasury.depositTaxes(TREASURY_CLAIM_UUID, new ChunkPos(31, 31), "admincmds", 17, level.getGameTime());
+
+ int result = runCommand(level, "bannermod treasury show " + TREASURY_CLAIM_UUID);
+
+ helper.assertTrue(result == 1, "Expected treasury show command to succeed for an existing ledger");
+ BannerModTreasuryLedgerSnapshot ledger = treasury.getLedger(TREASURY_CLAIM_UUID);
+ helper.assertTrue(ledger != null && ledger.treasuryBalance() == 17,
+ "Expected treasury show to leave existing balance unchanged at 17");
+ treasury.removeLedger(TREASURY_CLAIM_UUID);
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void claimTrustPruneDeadUuidsRemovesInvalidTrustedEntries(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ RecruitsClaim claim = new RecruitsClaim("admincmds-trust", TRUST_CLAIM_OWNER_UUID);
+ claim.addChunk(new ChunkPos(32, 32));
+ claim.setCenter(new ChunkPos(32, 32));
+ claim.getTrustedPlayers().add(new RecruitsPlayerInfo(TRUSTED_UUID, "Trusted"));
+ claim.getTrustedPlayers().add(null);
+ claim.getTrustedPlayers().add(new RecruitsPlayerInfo(TRUSTED_UUID, "Trusted duplicate"));
+ ClaimEvents.claimManager().testInsertClaim(claim);
+
+ int result = runCommand(level, "bannermod claim trust prune-dead-uuids");
+
+ helper.assertTrue(result >= 2, "Expected trust prune command to remove invalid and duplicate entries");
+ helper.assertTrue(claim.getTrustedPlayers().size() == 1,
+ "Expected trust prune to leave exactly one trusted player entry");
+ helper.assertTrue(TRUSTED_UUID.equals(claim.getTrustedPlayers().getFirst().getUUID()),
+ "Expected trust prune to preserve the valid trusted UUID");
+ ClaimEvents.claimManager().removeClaim(claim);
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void workerUnbindClearsBoundWorkArea(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ Player owner = helper.makeMockPlayer(GameType.SURVIVAL);
+ CropArea cropArea = BannerModGameTestSupport.spawnOwnedCropArea(helper, owner, new BlockPos(2, 2, 2));
+ FarmerEntity worker = BannerModGameTestSupport.spawnOwnedFarmer(helper, owner, new BlockPos(3, 2, 2));
+ worker.setCurrentWorkArea(cropArea);
+
+ int result = runCommand(level, "bannermod worker unbind " + worker.getId());
+
+ helper.assertTrue(result == 1, "Expected worker unbind command to succeed");
+ helper.assertTrue(worker.getBoundWorkAreaUUID() == null,
+ "Expected /bannermod worker unbind to clear the worker work-area binding");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void workerRehomeAssignsHomeForWorkersInChunk(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ Player owner = helper.makeMockPlayer(GameType.SURVIVAL);
+ FarmerEntity worker = BannerModGameTestSupport.spawnOwnedFarmer(helper, owner, new BlockPos(4, 2, 4));
+ ChunkPos chunk = worker.chunkPosition();
+
+ int result = runCommand(level, "bannermod worker rehome " + chunk.x + " " + chunk.z);
+
+ BlockPos expectedHome = new BlockPos(chunk.getMiddleBlockX(), level.getSeaLevel(), chunk.getMiddleBlockZ());
+ helper.assertTrue(result >= 1, "Expected worker rehome command to affect at least one worker");
+ helper.assertTrue(expectedHome.equals(worker.getHomePos()),
+ "Expected /bannermod worker rehome to assign the chunk-center home position");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void warWipeRemovesDeclaredWarByUuid(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ WarDeclarationRuntime declarations = WarRuntimeContext.declarations(level);
+ WarDeclarationRecord war = declarations.declareWar(
+ UUID.randomUUID(),
+ UUID.randomUUID(),
+ WarGoalType.WHITE_PEACE,
+ "admincmds-wipe",
+ List.of(),
+ List.of(),
+ List.of(),
+ level.getGameTime(),
+ 0L
+ ).orElseThrow();
+
+ int result = runCommand(level, "bannermod war wipe " + war.id());
+
+ helper.assertTrue(result == 1, "Expected war wipe command to succeed");
+ helper.assertTrue(declarations.byId(war.id()).isEmpty(),
+ "Expected /bannermod war wipe to remove the declared war");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void debugIndexRecruitsReportsChunk(GameTestHelper helper) {
+ int result = runCommand(helper.getLevel(), "bannermod debug index recruits 0,0");
+
+ helper.assertTrue(result >= 0, "Expected recruits index debug command to execute");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void debugIndexWorkersReportsChunk(GameTestHelper helper) {
+ int result = runCommand(helper.getLevel(), "bannermod debug index workers 0,0");
+
+ helper.assertTrue(result >= 0, "Expected workers index debug command to execute");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void debugIndexWorkareasReportsChunk(GameTestHelper helper) {
+ int result = runCommand(helper.getLevel(), "bannermod debug index workareas 0,0");
+
+ helper.assertTrue(result >= 0, "Expected workareas index debug command to execute");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void debugPathfindingStatsReportsSnapshot(GameTestHelper helper) {
+ GlobalPathfindingController.resetProfiling();
+
+ int result = runCommand(helper.getLevel(), "bannermod debug pathfinding stats");
+
+ helper.assertTrue(result == 1, "Expected pathfinding stats debug command to execute");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void debugCountersDumpReportsRuntimeCounters(GameTestHelper helper) {
+ RuntimeProfilingCounters.increment("gametest.admincmds.debug_counter");
+
+ int result = runCommand(helper.getLevel(), "bannermod debug counters dump");
+
+ helper.assertTrue(result >= 1, "Expected counters dump debug command to report at least one counter");
+ RuntimeProfilingCounters.reset();
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void debugSaveVersionsReportsKnownVersions(GameTestHelper helper) {
+ int result = runCommand(helper.getLevel(), "bannermod debug save-versions");
+
+ helper.assertTrue(result >= 1, "Expected save-versions debug command to report known SavedData versions");
+ helper.succeed();
+ }
+
+ private static int runCommand(ServerLevel level, String command) {
+ CommandSourceStack source = level.getServer().createCommandSourceStack().withPermission(2);
+ try {
+ return level.getServer().getCommands().getDispatcher().execute(command, source);
+ } catch (CommandSyntaxException exception) {
+ throw new IllegalStateException("Command failed: " + command, exception);
+ }
+ }
+}
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModBuildingInvalidationGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModBuildingInvalidationGameTests.java
index 90ed996c..0acc48fd 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModBuildingInvalidationGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModBuildingInvalidationGameTests.java
@@ -23,7 +23,7 @@
import com.talhanation.bannermod.settlement.validation.BuildingInvalidationQueueData;
import com.talhanation.bannermod.settlement.validation.BuildingInvalidationReason;
import com.talhanation.bannermod.settlement.validation.BuildingInvalidationRuntime;
-import com.talhanation.bannermod.settlement.validation.DefaultBuildingValidator;
+import com.talhanation.bannermod.settlement.validation.SettlementBuildingValidator;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
@@ -208,7 +208,7 @@ public static void overlappingDifferentBuildingTypeIsRejected(GameTestHelper hel
0L
));
- DefaultBuildingValidator validator = new DefaultBuildingValidator(new BuildingDefinitionRegistry());
+ SettlementBuildingValidator validator = new SettlementBuildingValidator(new BuildingDefinitionRegistry());
BuildingValidationRequest request = new BuildingValidationRequest(
settlementId,
BuildingType.HOUSE,
@@ -251,7 +251,7 @@ public static void nonPrimaryOverlapDoesNotTriggerConflict(GameTestHelper helper
0L
));
- DefaultBuildingValidator validator = new DefaultBuildingValidator(new BuildingDefinitionRegistry());
+ SettlementBuildingValidator validator = new SettlementBuildingValidator(new BuildingDefinitionRegistry());
BuildingValidationRequest request = new BuildingValidationRequest(
settlementId,
BuildingType.STORAGE,
@@ -294,7 +294,7 @@ public static void primaryZoneMatrixAllowsDisjointZonesWithinOverlappingBounds(G
level.setBlockAndUpdate(new BlockPos(x, origin.getY() + 1, z), Blocks.FARMLAND.defaultBlockState());
}
}
- DefaultBuildingValidator validator = new DefaultBuildingValidator(new BuildingDefinitionRegistry());
+ SettlementBuildingValidator validator = new SettlementBuildingValidator(new BuildingDefinitionRegistry());
BuildingValidationRequest request = new BuildingValidationRequest(
settlementId,
BuildingType.FARM,
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModClaimRemovalFanoutGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModClaimRemovalFanoutGameTests.java
index 85b1221d..20b9c0e7 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModClaimRemovalFanoutGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModClaimRemovalFanoutGameTests.java
@@ -6,8 +6,8 @@
import com.talhanation.bannermod.events.ClaimEvents;
import com.talhanation.bannermod.governance.BannerModTreasuryManager;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.war.WarRuntimeContext;
import com.talhanation.bannermod.war.runtime.OccupationRecord;
import com.talhanation.bannermod.war.runtime.OccupationRuntime;
@@ -62,8 +62,8 @@ public static void claimDeletionCascadesAllPerClaimRuntimeState(GameTestHelper h
"Expected treasury ledger to exist after seeding a deposit");
// 2) Settlement snapshot persisted for this claim
- BannerModSettlementManager settlements = BannerModSettlementManager.get(level);
- settlements.putSnapshot(BannerModSettlementSnapshot.create(claimUuid, anchorChunk, OWNER_TEAM_ID));
+ SettlementManager settlements = SettlementManager.get(level);
+ settlements.putSnapshot(SettlementSnapshot.create(claimUuid, anchorChunk, OWNER_TEAM_ID));
helper.assertTrue(settlements.getSnapshot(claimUuid) != null,
"Expected settlement snapshot to exist after putSnapshot");
@@ -127,9 +127,9 @@ public static void unrelatedClaimStateIsPreservedWhenSiblingClaimIsDeleted(GameT
treasury.depositTaxes(targetUuid, targetChunk, OWNER_TEAM_ID, 10, level.getGameTime());
treasury.depositTaxes(siblingUuid, siblingChunk, OTHER_TEAM_ID, 17, level.getGameTime());
- BannerModSettlementManager settlements = BannerModSettlementManager.get(level);
- settlements.putSnapshot(BannerModSettlementSnapshot.create(targetUuid, targetChunk, OWNER_TEAM_ID));
- settlements.putSnapshot(BannerModSettlementSnapshot.create(siblingUuid, siblingChunk, OTHER_TEAM_ID));
+ SettlementManager settlements = SettlementManager.get(level);
+ settlements.putSnapshot(SettlementSnapshot.create(targetUuid, targetChunk, OWNER_TEAM_ID));
+ settlements.putSnapshot(SettlementSnapshot.create(siblingUuid, siblingChunk, OTHER_TEAM_ID));
CropArea siblingArea = BannerModGameTestSupport.spawnOwnedCropArea(helper, otherOwner, siblingPos);
siblingArea.setTeamStringID(OTHER_TEAM_ID);
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModDedicatedServerGameTestSupport.java b/src/gametest/java/com/talhanation/bannermod/BannerModDedicatedServerGameTestSupport.java
index f9d1b476..576e5d89 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModDedicatedServerGameTestSupport.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModDedicatedServerGameTestSupport.java
@@ -10,11 +10,11 @@
import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
import com.talhanation.bannermod.entity.civilian.workarea.AbstractWorkAreaEntity;
import com.talhanation.bannermod.config.RecruitsServerConfig;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.war.WarRuntimeContext;
import com.talhanation.bannermod.war.registry.PoliticalEntityRecord;
import net.minecraft.core.BlockPos;
@@ -129,12 +129,12 @@ public static void removeClaim(ServerLevel level, RecruitsClaim claim) {
* {@code NO_FREE_HOUSING}, because dedicated GameTest harnesses do not
* stand up real prefab housing buildings.
*/
- public static BannerModSettlementSnapshot seedHousingSnapshot(ServerLevel level,
+ public static SettlementSnapshot seedHousingSnapshot(ServerLevel level,
RecruitsClaim claim,
int residentCapacity) {
- BannerModSettlementManager manager = BannerModSettlementManager.get(level);
- BannerModSettlementSnapshot existing = manager.getSnapshot(claim.getUUID());
- BannerModSettlementBuildingRecord housing = new BannerModSettlementBuildingRecord(
+ SettlementManager manager = SettlementManager.get(level);
+ SettlementSnapshot existing = manager.getSnapshot(claim.getUUID());
+ SettlementBuildingRecord housing = new SettlementBuildingRecord(
UUID.randomUUID(),
"bannermod_test:housing",
claim.getCenter().getWorldPosition(),
@@ -150,15 +150,15 @@ public static BannerModSettlementSnapshot seedHousingSnapshot(ServerLevel level,
false,
false,
List.of(),
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL
);
- List<BannerModSettlementBuildingRecord> buildings = existing == null
+ List<SettlementBuildingRecord> buildings = existing == null
? new ArrayList<>()
: new ArrayList<>(existing.buildings());
buildings.add(housing);
- BannerModSettlementSnapshot snapshot = existing == null
- ? new BannerModSettlementSnapshot(
+ SettlementSnapshot snapshot = existing == null
+ ? new SettlementSnapshot(
claim.getUUID(),
claim.getCenter().x,
claim.getCenter().z,
@@ -166,15 +166,15 @@ public static BannerModSettlementSnapshot seedHousingSnapshot(ServerLevel level,
level.getGameTime(),
Math.max(1, residentCapacity),
0, 0, 0, 0, 0,
- com.talhanation.bannermod.settlement.BannerModSettlementStockpileSummary.empty(),
- com.talhanation.bannermod.settlement.BannerModSettlementMarketState.empty(),
- com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodsSeed.empty(),
- com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed.empty(),
- com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed.empty(),
- com.talhanation.bannermod.settlement.BannerModSettlementSupplySignalState.empty(),
+ com.talhanation.bannermod.settlement.SettlementStockpileSummary.empty(),
+ com.talhanation.bannermod.settlement.SettlementMarketState.empty(),
+ com.talhanation.bannermod.settlement.SettlementDesiredGoodsSnapshot.empty(),
+ com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot.empty(),
+ com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot.empty(),
+ com.talhanation.bannermod.settlement.SettlementSupplySignalState.empty(),
List.of(),
buildings)
- : new BannerModSettlementSnapshot(
+ : new SettlementSnapshot(
existing.claimUuid(),
existing.anchorChunkX(),
existing.anchorChunkZ(),
@@ -188,9 +188,9 @@ public static BannerModSettlementSnapshot seedHousingSnapshot(ServerLevel level,
existing.missingWorkAreaAssignmentCount(),
existing.stockpileSummary(),
existing.marketState(),
- existing.desiredGoodsSeed(),
- existing.projectCandidateSeed(),
- existing.tradeRouteHandoffSeed(),
+ existing.desiredGoodsSnapshot(),
+ existing.projectCandidateSnapshot(),
+ existing.tradeRouteHandoffSnapshot(),
existing.supplySignalState(),
existing.residents(),
buildings);
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModHomeAssignGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModHomeAssignGameTests.java
index 35d64bd7..cf3b6d2f 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModHomeAssignGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModHomeAssignGameTests.java
@@ -5,6 +5,12 @@
import com.talhanation.bannermod.entity.civilian.FarmerEntity;
import com.talhanation.bannermod.entity.military.RecruitEntity;
import com.talhanation.bannermod.network.messages.civilian.MessageAssignHome;
+import com.talhanation.bannermod.settlement.building.BuildingType;
+import com.talhanation.bannermod.settlement.building.BuildingValidationState;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRegistryData;
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
@@ -12,11 +18,14 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.GameType;
+import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
import net.neoforged.neoforge.gametest.GameTestHolder;
import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
+import java.util.List;
import java.util.Optional;
import java.util.UUID;
@@ -27,7 +36,8 @@
* <li>Recruits, workers, and citizens all expose a {@code homePos} that
* round-trips through NBT.</li>
* <li>{@link MessageAssignHome#handle} validates ownership and bed
- * targets (rejects unknown entity, non-owner, and non-bed pos).</li>
+ * targets, then applies the same server-side home update used by the
+ * 30-second Assign Home selector flow.</li>
* </ul>
*
* <p>Save/load round-trip is exercised in the harness by the
@@ -125,7 +135,7 @@ public static void citizenHomePosRoundTripsThroughSaveLoad(GameTestHelper helper
@PrefixGameTestTemplate(false)
@GameTest(template = "harness_empty")
- public static void assignHomeAcceptsBedFromOwner(GameTestHelper helper) {
+ public static void assignHomeMessageAcceptsBedFromOwner(GameTestHelper helper) {
UUID ownerId = UUID.randomUUID();
ServerPlayer owner = (ServerPlayer) BannerModDedicatedServerGameTestSupport.createPositionedFakeServerPlayer(
helper.getLevel(), ownerId, "homeassign-owner", helper.absolutePos(BlockPos.ZERO));
@@ -134,6 +144,7 @@ public static void assignHomeAcceptsBedFromOwner(GameTestHelper helper) {
// Pin the recruit's owner explicitly to the fake server player so the
// ownership check inside MessageAssignHome#handle accepts the request.
recruit.setOwnerUUID(Optional.of(ownerId));
+ recruit.setHomeBuildAreaUUID(UUID.randomUUID());
BlockPos bedRel = new BlockPos(1, 1, 1);
BlockPos bedAbs = helper.absolutePos(bedRel);
@@ -143,7 +154,49 @@ public static void assignHomeAcceptsBedFromOwner(GameTestHelper helper) {
boolean accepted = MessageAssignHome.handle(owner, recruit.getUUID(), bedAbs);
helper.assertTrue(accepted, "Owner should be allowed to assign a bed as home");
helper.assertTrue(bedAbs.equals(recruit.getHomePos()),
- "Recruit homePos must update to the bed BlockPos after assign-home");
+ "Recruit homePos must update to the bed BlockPos through MessageAssignHome");
+ helper.assertTrue(recruit.getHomeBuildAreaUUID() == null,
+ "MessageAssignHome must clear stale prefab home linkage for direct bed assignment");
+
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void assignHomeMessageAcceptsValidatedSleepingZoneFromOwner(GameTestHelper helper) {
+ UUID ownerId = UUID.randomUUID();
+ ServerPlayer owner = (ServerPlayer) BannerModDedicatedServerGameTestSupport.createPositionedFakeServerPlayer(
+ helper.getLevel(), ownerId, "homeassign-zone-owner", helper.absolutePos(BlockPos.ZERO));
+
+ RecruitEntity recruit = BannerModGameTestSupport.spawnOwnedRecruit(helper, owner, BlockPos.ZERO);
+ recruit.setOwnerUUID(Optional.of(ownerId));
+ recruit.setHomeBuildAreaUUID(UUID.randomUUID());
+
+ BlockPos sleepMin = helper.absolutePos(new BlockPos(2, 1, 2));
+ BlockPos sleepMax = helper.absolutePos(new BlockPos(3, 1, 3));
+ BlockPos target = helper.absolutePos(new BlockPos(2, 1, 2));
+ ValidatedBuildingRegistryData.get(helper.getLevel()).registerBuilding(new ValidatedBuildingRecord(
+ UUID.randomUUID(),
+ UUID.randomUUID(),
+ BuildingType.HOUSE,
+ Level.OVERWORLD,
+ target,
+ List.of(new ZoneSelection(ZoneRole.SLEEPING, sleepMin, sleepMax, null)),
+ new AABB(sleepMin.getX(), sleepMin.getY(), sleepMin.getZ(), sleepMax.getX() + 1.0D, sleepMax.getY() + 1.0D, sleepMax.getZ() + 1.0D),
+ BuildingValidationState.VALID,
+ 1,
+ 80,
+ helper.getLevel().getGameTime(),
+ helper.getLevel().getGameTime(),
+ 0L
+ ));
+
+ boolean accepted = MessageAssignHome.handle(owner, recruit.getUUID(), target);
+ helper.assertTrue(accepted, "Owner should be allowed to assign a validated sleeping zone as home");
+ helper.assertTrue(target.equals(recruit.getHomePos()),
+ "Recruit homePos must update to the sleeping-zone BlockPos through MessageAssignHome");
+ helper.assertTrue(recruit.getHomeBuildAreaUUID() == null,
+ "MessageAssignHome must clear stale prefab home linkage for direct sleeping-zone assignment");
helper.succeed();
}
@@ -169,4 +222,28 @@ public static void assignHomeRejectsNonBedBlock(GameTestHelper helper) {
helper.succeed();
}
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void assignHomeRejectsForeignSender(GameTestHelper helper) {
+ UUID ownerId = UUID.randomUUID();
+ UUID intruderId = UUID.randomUUID();
+ ServerPlayer owner = (ServerPlayer) BannerModDedicatedServerGameTestSupport.createPositionedFakeServerPlayer(
+ helper.getLevel(), ownerId, "homeassign-owner-3", helper.absolutePos(BlockPos.ZERO));
+ ServerPlayer intruder = (ServerPlayer) BannerModDedicatedServerGameTestSupport.createPositionedFakeServerPlayer(
+ helper.getLevel(), intruderId, "homeassign-intruder", helper.absolutePos(BlockPos.ZERO));
+
+ RecruitEntity recruit = BannerModGameTestSupport.spawnOwnedRecruit(helper, owner, BlockPos.ZERO);
+ recruit.setOwnerUUID(Optional.of(ownerId));
+
+ BlockPos bedAbs = helper.absolutePos(new BlockPos(1, 1, 2));
+ helper.getLevel().setBlock(bedAbs, Blocks.RED_BED.defaultBlockState(), 3);
+
+ boolean accepted = MessageAssignHome.handle(intruder, recruit.getUUID(), bedAbs);
+ helper.assertFalse(accepted, "Foreign sender must not assign another player's recruit home");
+ helper.assertTrue(recruit.getHomePos() == null,
+ "Recruit homePos must remain unset after a rejected foreign assignment");
+
+ helper.succeed();
+ }
}
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModOwnershipCycleGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModOwnershipCycleGameTests.java
index 5a4be10a..bda62e15 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModOwnershipCycleGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModOwnershipCycleGameTests.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.gametest.support.RecruitsBattleGameTestSupport;
import com.talhanation.bannermod.entity.civilian.FarmerEntity;
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModPathfindHomeGoalGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModPathfindHomeGoalGameTests.java
index 2e80713a..bf0a30c1 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModPathfindHomeGoalGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModPathfindHomeGoalGameTests.java
@@ -9,6 +9,7 @@
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.PathfinderMob;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.GameType;
import net.minecraft.world.level.block.Blocks;
@@ -27,10 +28,8 @@
* pathfinds the entity to within 3 blocks of that position; on arrival it
* either enters the bed at homePos or stops navigation as a sleep-on-ground
* fallback. These tests construct the goal directly against freshly spawned
- * recruits, workers, and citizens and exercise canUse/tick semantics rather
- * than waiting many simulated ticks for navigation to physically converge —
- * the navigation behaviour itself is exercised by other GameTests already
- * (BannerModTrueAsyncPathfindingGameTests).
+ * recruits, workers, and citizens so they exercise the home goal without
+ * unrelated selector priority or combat/work goals masking the assertion.
*/
@GameTestHolder(BannerModMain.MOD_ID)
public class BannerModPathfindHomeGoalGameTests {
@@ -41,15 +40,17 @@ public class BannerModPathfindHomeGoalGameTests {
private static long NIGHT = 14_000L;
@PrefixGameTestTemplate(false)
- @GameTest(template = "harness_empty")
+ @GameTest(template = "harness_empty", timeoutTicks = 400)
public static void recruitGoesHomeAtNight(GameTestHelper helper) {
Player owner = helper.makeMockPlayer(GameType.SURVIVAL);
- RecruitEntity recruit = BannerModGameTestSupport.spawnOwnedRecruit(helper, owner, BlockPos.ZERO);
+ prepareFlatPath(helper, new BlockPos(1, 0, 1), new BlockPos(12, 0, 1));
+
+ RecruitEntity recruit = BannerModGameTestSupport.spawnOwnedRecruit(helper, owner, new BlockPos(1, 1, 1));
// FollowState 0 = idle/free; otherwise the recruit's existing rest predicates
// suppress non-combat goals and our test would assert nothing meaningful.
recruit.setFollowState(0);
- BlockPos bedRel = new BlockPos(2, 1, 2);
+ BlockPos bedRel = new BlockPos(11, 1, 1);
BlockPos bedAbs = placeBed(helper, bedRel);
recruit.setHomePos(bedAbs);
@@ -66,6 +67,7 @@ public static void recruitGoesHomeAtNight(GameTestHelper helper) {
helper.assertTrue(goal.canUse(),
"PathfindHomeGoal must trigger for recruit at night with home assigned");
+ goal.start();
// Daytime regression: full health, full morale, day-time => goal must NOT trigger.
// Use a fresh goal instance because canUse() internally throttles at 20 ticks
@@ -83,17 +85,23 @@ public static void recruitGoesHomeAtNight(GameTestHelper helper) {
helper.assertFalse(dayGoal.canUse(),
"PathfindHomeGoal must stay dormant in daylight for a healthy recruit with home assigned");
- helper.succeed();
+ forceTimeOfDay(level, NIGHT);
+ helper.succeedWhen(() -> {
+ goal.tick();
+ assertWithinHomeRange(helper, recruit, bedAbs, "recruit");
+ });
}
@PrefixGameTestTemplate(false)
- @GameTest(template = "harness_empty")
+ @GameTest(template = "harness_empty", timeoutTicks = 400)
public static void workerGoesHomeAtNight(GameTestHelper helper) {
Player owner = helper.makeMockPlayer(GameType.SURVIVAL);
- FarmerEntity worker = BannerModGameTestSupport.spawnOwnedFarmer(helper, owner, BlockPos.ZERO);
+ prepareFlatPath(helper, new BlockPos(1, 0, 2), new BlockPos(12, 0, 2));
+
+ FarmerEntity worker = BannerModGameTestSupport.spawnOwnedFarmer(helper, owner, new BlockPos(1, 1, 2));
worker.setFollowState(0);
- BlockPos bedRel = new BlockPos(3, 1, 3);
+ BlockPos bedRel = new BlockPos(11, 1, 2);
BlockPos bedAbs = placeBed(helper, bedRel);
worker.setHomePos(bedAbs);
@@ -110,19 +118,25 @@ public static void workerGoesHomeAtNight(GameTestHelper helper) {
helper.assertTrue(goal.canUse(),
"PathfindHomeGoal must trigger for worker at night with home assigned");
+ goal.start();
- helper.succeed();
+ helper.succeedWhen(() -> {
+ goal.tick();
+ assertWithinHomeRange(helper, worker, bedAbs, "worker");
+ });
}
@PrefixGameTestTemplate(false)
- @GameTest(template = "harness_empty")
+ @GameTest(template = "harness_empty", timeoutTicks = 400)
public static void citizenGoesHomeAtNight(GameTestHelper helper) {
+ prepareFlatPath(helper, new BlockPos(1, 0, 3), new BlockPos(12, 0, 3));
+
CitizenEntity citizen = BannerModGameTestSupport.spawnEntity(
helper,
com.talhanation.bannermod.registry.citizen.ModCitizenEntityTypes.CITIZEN.get(),
- BlockPos.ZERO);
+ new BlockPos(1, 1, 3));
- BlockPos bedRel = new BlockPos(4, 1, 4);
+ BlockPos bedRel = new BlockPos(11, 1, 3);
BlockPos bedAbs = placeBed(helper, bedRel);
citizen.setHomePos(bedAbs);
@@ -132,6 +146,7 @@ public static void citizenGoesHomeAtNight(GameTestHelper helper) {
PathfindHomeGoal goal = new PathfindHomeGoal(citizen, citizen::getHomePos);
helper.assertTrue(goal.canUse(),
"PathfindHomeGoal must trigger for citizen at night with home assigned");
+ goal.start();
// Daytime regression for citizen: no stamina signal, so goal must be silent.
// Use a fresh goal instance — see recruitGoesHomeAtNight for the throttle rationale.
@@ -140,7 +155,11 @@ public static void citizenGoesHomeAtNight(GameTestHelper helper) {
helper.assertFalse(dayGoal.canUse(),
"PathfindHomeGoal must stay dormant in daylight for a citizen with home assigned");
- helper.succeed();
+ forceTimeOfDay(level, NIGHT);
+ helper.succeedWhen(() -> {
+ goal.tick();
+ assertWithinHomeRange(helper, citizen, bedAbs, "citizen");
+ });
}
@PrefixGameTestTemplate(false)
@@ -197,13 +216,15 @@ public static void arrivalAtBedTriggersSleep(GameTestHelper helper) {
* code path the level loader uses on world reload.
*/
@PrefixGameTestTemplate(false)
- @GameTest(template = "harness_empty")
+ @GameTest(template = "harness_empty", timeoutTicks = 400)
public static void rebuiltGoalResumesAfterReload(GameTestHelper helper) {
Player owner = helper.makeMockPlayer(GameType.SURVIVAL);
- RecruitEntity recruit = BannerModGameTestSupport.spawnOwnedRecruit(helper, owner, BlockPos.ZERO);
+ prepareFlatPath(helper, new BlockPos(1, 0, 4), new BlockPos(12, 0, 4));
+
+ RecruitEntity recruit = BannerModGameTestSupport.spawnOwnedRecruit(helper, owner, new BlockPos(1, 1, 4));
recruit.setFollowState(0);
- BlockPos bedRel = new BlockPos(2, 1, 2);
+ BlockPos bedRel = new BlockPos(11, 1, 4);
BlockPos bedAbs = placeBed(helper, bedRel);
recruit.setHomePos(bedAbs);
@@ -217,18 +238,51 @@ public static void rebuiltGoalResumesAfterReload(GameTestHelper helper) {
PathfindHomeGoal first = new PathfindHomeGoal(recruit, recruit::getHomePos, staminaSignal, 1.0D);
helper.assertTrue(first.canUse(), "Pre-reload goal must trigger");
first.start();
-
- // Simulate a reload: drop the goal instance, advance the clock past the
- // 20-tick canUse throttle, and rebuild against the same entity. The
- // entity's homePos survives because it lives on the entity's persistent
- // synched data (HOMEASSIGN-002), so the new goal must accept canUse with
- // no extra wiring.
+ first.tick();
+ // Clear the pre-reload route so arrival proves the rebuilt goal moved the recruit.
+ recruit.getNavigation().stop();
+
+ // Simulate a reload: drop the goal instance and rebuild against the same
+ // entity. The entity's homePos survives because it lives on the entity's
+ // persistent synched data (HOMEASSIGN-002), so the new goal must accept
+ // canUse with no extra wiring.
forceTimeOfDay(level, NIGHT + 100L);
PathfindHomeGoal rebuilt = new PathfindHomeGoal(recruit, recruit::getHomePos, staminaSignal, 1.0D);
helper.assertTrue(rebuilt.canUse(),
"Rebuilt goal must resume after reload because homePos is persistent");
+ rebuilt.start();
- helper.succeed();
+ helper.succeedWhen(() -> {
+ rebuilt.tick();
+ assertWithinHomeRange(helper, recruit, bedAbs, "restarted recruit");
+ });
+ }
+
+ private static void assertWithinHomeRange(GameTestHelper helper,
+ PathfinderMob mob,
+ BlockPos home,
+ String label) {
+ double distSqr = mob.position().distanceToSqr(
+ home.getX() + 0.5D, home.getY() + 0.5D, home.getZ() + 0.5D);
+ helper.assertTrue(distSqr <= 9.0D,
+ "Expected " + label + " to reach within 3 blocks of assigned home; distance squared was " + distSqr);
+ }
+
+ private static void prepareFlatPath(GameTestHelper helper, BlockPos fromRel, BlockPos toRel) {
+ int minX = Math.min(fromRel.getX(), toRel.getX());
+ int maxX = Math.max(fromRel.getX(), toRel.getX());
+ int minZ = Math.min(fromRel.getZ(), toRel.getZ());
+ int maxZ = Math.max(fromRel.getZ(), toRel.getZ());
+ for (int x = minX; x <= maxX; x++) {
+ for (int z = minZ; z <= maxZ; z++) {
+ helper.getLevel().setBlockAndUpdate(helper.absolutePos(new BlockPos(x, fromRel.getY(), z)),
+ Blocks.STONE.defaultBlockState());
+ helper.getLevel().setBlockAndUpdate(helper.absolutePos(new BlockPos(x, fromRel.getY() + 1, z)),
+ Blocks.AIR.defaultBlockState());
+ helper.getLevel().setBlockAndUpdate(helper.absolutePos(new BlockPos(x, fromRel.getY() + 2, z)),
+ Blocks.AIR.defaultBlockState());
+ }
+ }
}
/**
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModPlayerCycleGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModPlayerCycleGameTests.java
index 3ff60469..422780da 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModPlayerCycleGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModPlayerCycleGameTests.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.shared.logistics.BannerModSupplyStatus;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.gametest.support.RecruitsBattleGameTestSupport;
import com.talhanation.bannermod.entity.civilian.FarmerEntity;
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModSettlementFactionEnforcementGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModSettlementFactionEnforcementGameTests.java
index 4c239eec..8580432a 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModSettlementFactionEnforcementGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModSettlementFactionEnforcementGameTests.java
@@ -207,12 +207,11 @@ private static boolean isInsideOwnFactionClaim(ServerPlayer player, BlockPos tar
if (player.getTeam() == null || ClaimEvents.claimManager() == null) {
return false;
}
- ChunkPos chunkPos = new ChunkPos(targetPos);
- RecruitsClaim claim = ClaimEvents.claimManager().getClaim(chunkPos);
- return claim != null
- && claim.containsChunk(chunkPos)
- && claim.getOwnerPoliticalEntityId() != null
- && claim.getOwnerPoliticalEntityId().equals(com.talhanation.bannermod.war.registry.PoliticalMembership.entityIdFor(
- com.talhanation.bannermod.war.WarRuntimeContext.registry(player.serverLevel()), player.getUUID()));
+ BannerModSettlementBinding.Binding binding = BannerModSettlementBinding.resolveFactionStatus(
+ ClaimEvents.claimManager(),
+ targetPos,
+ player.getTeam().getName()
+ );
+ return binding.isFriendly();
}
}
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModSettlementProjectGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModSettlementProjectGameTests.java
index 83a0da01..92639f5d 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModSettlementProjectGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModSettlementProjectGameTests.java
@@ -4,14 +4,14 @@
import com.talhanation.bannermod.entity.civilian.workarea.BuildArea;
import com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
import com.talhanation.bannermod.settlement.growth.PendingProject;
import com.talhanation.bannermod.settlement.growth.ProjectBlocker;
import com.talhanation.bannermod.settlement.growth.ProjectKind;
import com.talhanation.bannermod.settlement.project.AssignmentPhase;
import com.talhanation.bannermod.settlement.project.BannerModBuildAreaProjectBridge;
-import com.talhanation.bannermod.settlement.project.BannerModSettlementProjectRuntime;
+import com.talhanation.bannermod.settlement.project.SettlementProjectRuntime;
import com.talhanation.bannermod.settlement.project.ProjectAssignment;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;
@@ -65,16 +65,16 @@ private static void runAssertSettlementProjectCreatesExecutableBuildAreaInWorld(
UUID.randomUUID(),
ProjectKind.NEW_BUILDING,
null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
100,
level.getGameTime(),
20,
ProjectBlocker.NONE
);
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.forServer(level);
- ProjectAssignment assignment = BannerModSettlementProjectRuntime.tickClaim(
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.forServer(level);
+ ProjectAssignment assignment = SettlementProjectRuntime.tickClaim(
level,
claim.getUUID(),
List.of(project)
@@ -118,15 +118,15 @@ static void assertSettlementProjectBindsToExecutableBuildAreaTarget(GameTestHelp
UUID.randomUUID(),
ProjectKind.NEW_BUILDING,
null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
100,
level.getGameTime(),
20,
ProjectBlocker.NONE
);
- Optional<ProjectAssignment> assignment = BannerModSettlementProjectRuntime.detachedForTests().tickClaim(
+ Optional<ProjectAssignment> assignment = SettlementProjectRuntime.detachedForTests().tickClaim(
level,
claim.getUUID(),
List.of(project),
@@ -161,15 +161,15 @@ static void assertSettlementProjectProgressesFromBuildExecutionEvents(GameTestHe
UUID.randomUUID(),
ProjectKind.NEW_BUILDING,
null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
100,
level.getGameTime(),
20,
ProjectBlocker.NONE
);
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.forServer(level);
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.forServer(level);
ProjectAssignment assignment = runtime.tickClaim(
level,
claim.getUUID(),
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModStarterFortGameTestSupport.java b/src/gametest/java/com/talhanation/bannermod/BannerModStarterFortGameTestSupport.java
index 4a61d8dc..39819fe9 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModStarterFortGameTestSupport.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModStarterFortGameTestSupport.java
@@ -6,7 +6,7 @@
import com.talhanation.bannermod.settlement.building.ZoneSelection;
import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
-import com.talhanation.bannermod.settlement.validation.DefaultBuildingValidator;
+import com.talhanation.bannermod.settlement.validation.SettlementBuildingValidator;
import com.talhanation.bannermod.settlement.validation.StarterFortPlan;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
@@ -47,7 +47,7 @@ public static void buildValidFort(ServerLevel level, BlockPos anchor) {
}
public static BuildingValidationResult validateStarterFort(ServerLevel level, BlockPos anchor) {
- return new DefaultBuildingValidator(new BuildingDefinitionRegistry()).validate(
+ return new SettlementBuildingValidator(new BuildingDefinitionRegistry()).validate(
level,
null,
new BuildingValidationRequest(
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderClaimReleaseGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderClaimReleaseGameTests.java
index 3577e849..e6da08c7 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderClaimReleaseGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderClaimReleaseGameTests.java
@@ -3,7 +3,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.entity.civilian.FarmerEntity;
import com.talhanation.bannermod.events.civilian.SettlementWorkOrderClaimReleaseEvents;
-import com.talhanation.bannermod.settlement.BannerModSettlementOrchestrator;
+import com.talhanation.bannermod.settlement.SettlementOrchestrator;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderStatus;
@@ -57,7 +57,7 @@ public static void workerDeathReleasesActiveWorkOrderClaim(GameTestHelper helper
BannerModDedicatedServerGameTestSupport.assignDetachedOwnership(worker, LEADER_UUID);
BannerModDedicatedServerGameTestSupport.joinTeam(level, TEAM_ID, worker);
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
helper.assertTrue(runtime != null, "Expected the level to expose a SettlementWorkOrderRuntime.");
SettlementWorkOrder published = runtime.publish(SettlementWorkOrder.pending(
DEATH_CLAIM_UUID, DEATH_BUILDING_UUID, SettlementWorkOrderType.HARVEST_CROP,
@@ -103,7 +103,7 @@ public static void workerForcedRemovalReleasesActiveWorkOrderClaim(GameTestHelpe
BannerModDedicatedServerGameTestSupport.assignDetachedOwnership(worker, LEADER_UUID);
BannerModDedicatedServerGameTestSupport.joinTeam(level, TEAM_ID, worker);
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
helper.assertTrue(runtime != null, "Expected the level to expose a SettlementWorkOrderRuntime.");
SettlementWorkOrder published = runtime.publish(SettlementWorkOrder.pending(
DISCARD_CLAIM_UUID, DISCARD_BUILDING_UUID, SettlementWorkOrderType.HARVEST_CROP,
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderTransportGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderTransportGameTests.java
index 61d30fde..c71e7e89 100644
--- a/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderTransportGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModWorkOrderTransportGameTests.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.ai.civilian.TransportContainerExchange;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementOrchestrator;
+import com.talhanation.bannermod.settlement.SettlementOrchestrator;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderStatus;
@@ -70,7 +70,7 @@ public static void fetchInputOrderRoutesItemsFromSourceToDestinationChest(GameTe
"Expected vanilla chests at the configured FETCH_INPUT anchor positions.");
sourceChest.setItem(0, new ItemStack(Items.WHEAT, 8));
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
helper.assertTrue(runtime != null, "Expected the level to expose a SettlementWorkOrderRuntime.");
SettlementWorkOrder published = runtime.publish(SettlementWorkOrder.pendingTransport(
CLAIM_UUID,
@@ -132,7 +132,7 @@ public static void fetchInputResourceHintFilterIgnoresNonMatchingItemsInSharedCh
sourceChest.setItem(0, new ItemStack(Items.WHEAT, 8));
sourceChest.setItem(1, new ItemStack(Items.BREAD, 8));
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
SettlementWorkOrder claimed = runtime.publish(SettlementWorkOrder.pendingTransport(
CLAIM_UUID, BUILDING_UUID, SettlementWorkOrderType.FETCH_INPUT,
sourceAbs, destinationAbs, "minecraft:wheat", 8, 70, level.getGameTime()
@@ -184,7 +184,7 @@ public static void multiStorageRoutingDrainsOnlyTheChestAtTheOrdersSourceAddress
decoyA.setItem(0, new ItemStack(Items.WHEAT, 64));
// decoyB stays empty — must not silently receive the deposit either.
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
SettlementWorkOrder claimed = runtime.publish(SettlementWorkOrder.pendingTransport(
CLAIM_UUID, BUILDING_UUID, SettlementWorkOrderType.FETCH_INPUT,
sourceAbs, destinationAbs, "minecraft:wheat", 12, 70, level.getGameTime()
diff --git a/src/gametest/java/com/talhanation/bannermod/BannerModWorkerReassignAuthorityGameTests.java b/src/gametest/java/com/talhanation/bannermod/BannerModWorkerReassignAuthorityGameTests.java
new file mode 100644
index 00000000..0f54e796
--- /dev/null
+++ b/src/gametest/java/com/talhanation/bannermod/BannerModWorkerReassignAuthorityGameTests.java
@@ -0,0 +1,109 @@
+package com.talhanation.bannermod;
+
+import com.talhanation.bannermod.bootstrap.BannerModMain;
+import com.talhanation.bannermod.citizen.CitizenProfession;
+import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
+import com.talhanation.bannermod.entity.civilian.FarmerEntity;
+import com.talhanation.bannermod.entity.civilian.LumberjackEntity;
+import com.talhanation.bannermod.entity.civilian.WorkerCitizenConversionService;
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.phys.AABB;
+import net.neoforged.neoforge.gametest.GameTestHolder;
+import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
+
+import java.util.List;
+import java.util.UUID;
+
+@GameTestHolder(BannerModMain.MOD_ID)
+public class BannerModWorkerReassignAuthorityGameTests {
+ private static final UUID OWNER_UUID = UUID.fromString("00000000-0000-0000-0000-000000001a01");
+ private static final UUID OUTSIDER_UUID = UUID.fromString("00000000-0000-0000-0000-000000001a02");
+ private static final BlockPos WORKER_POS = new BlockPos(3, 2, 3);
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void nonOwnerReassignDeniedAndWorkerStateUnchanged(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ BlockPos workerAbsolutePos = helper.absolutePos(WORKER_POS);
+ ServerPlayer owner = createPlayer(level, OWNER_UUID, "workerui-001a-owner", workerAbsolutePos);
+ ServerPlayer outsider = createPlayer(level, OUTSIDER_UUID, "workerui-001a-outsider", workerAbsolutePos);
+ FarmerEntity worker = BannerModGameTestSupport.spawnOwnedFarmer(helper, owner, WORKER_POS);
+
+ UUID workerUuid = worker.getUUID();
+ UUID ownerUuid = worker.getOwnerUUID();
+ int followState = worker.getFollowState();
+ BlockPos blockPos = worker.blockPosition();
+
+ String denialKey = WorkerCitizenConversionService.reassignProfession(
+ outsider,
+ worker,
+ CitizenProfession.LUMBERJACK
+ );
+
+ helper.assertTrue("gui.bannermod.worker_screen.convert.denied.not_controller".equals(denialKey),
+ "Expected non-owner worker reassignment to return the not-controller denial key");
+ helper.assertFalse(worker.isRemoved(),
+ "Expected denied reassignment to keep the original worker entity alive");
+ helper.assertTrue(level.getEntity(workerUuid) == worker,
+ "Expected denied reassignment to keep the same worker entity registered");
+ helper.assertTrue(worker instanceof FarmerEntity,
+ "Expected denied reassignment to keep the original farmer profession/entity type");
+ helper.assertTrue(ownerUuid != null && ownerUuid.equals(worker.getOwnerUUID()),
+ "Expected denied reassignment to preserve worker ownership");
+ helper.assertTrue(worker.isOwned(),
+ "Expected denied reassignment to preserve owned state");
+ helper.assertTrue(followState == worker.getFollowState(),
+ "Expected denied reassignment to preserve follow state");
+ helper.assertTrue(blockPos.equals(worker.blockPosition()),
+ "Expected denied reassignment to preserve worker position");
+ helper.assertTrue(workersNear(level, workerAbsolutePos).size() == 1,
+ "Expected denied reassignment not to spawn a replacement worker");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void ownerReassignSmokeReplacesWorkerProfession(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ BlockPos workerAbsolutePos = helper.absolutePos(WORKER_POS);
+ ServerPlayer owner = createPlayer(level, OWNER_UUID, "workerui-001a-owner-success", workerAbsolutePos);
+ FarmerEntity worker = BannerModGameTestSupport.spawnOwnedFarmer(helper, owner, WORKER_POS);
+ UUID oldWorkerUuid = worker.getUUID();
+
+ String denialKey = WorkerCitizenConversionService.reassignProfession(
+ owner,
+ worker,
+ CitizenProfession.LUMBERJACK
+ );
+
+ helper.assertTrue(denialKey == null,
+ "Expected owner worker reassignment to succeed");
+ helper.assertTrue(worker.isRemoved(),
+ "Expected successful reassignment to remove the original worker");
+ helper.assertTrue(level.getEntity(oldWorkerUuid) == null,
+ "Expected successful reassignment to unregister the original worker entity");
+ List<AbstractWorkerEntity> workers = workersNear(level, workerAbsolutePos);
+ helper.assertTrue(workers.size() == 1,
+ "Expected successful reassignment to leave exactly one replacement worker");
+ AbstractWorkerEntity replacement = workers.get(0);
+ helper.assertTrue(replacement instanceof LumberjackEntity,
+ "Expected successful reassignment to spawn a lumberjack replacement");
+ helper.assertTrue(OWNER_UUID.equals(replacement.getOwnerUUID()),
+ "Expected successful reassignment to preserve owner UUID");
+ helper.assertTrue(replacement.isOwned(),
+ "Expected successful reassignment to preserve owned state");
+ helper.succeed();
+ }
+
+ private static ServerPlayer createPlayer(ServerLevel level, UUID playerId, String name, BlockPos pos) {
+ return (ServerPlayer) BannerModDedicatedServerGameTestSupport.createPositionedFakeServerPlayer(level, playerId, name, pos);
+ }
+
+ private static List<AbstractWorkerEntity> workersNear(ServerLevel level, BlockPos pos) {
+ return level.getEntitiesOfClass(AbstractWorkerEntity.class, new AABB(pos).inflate(2.0D));
+ }
+}
diff --git a/src/gametest/java/com/talhanation/bannermod/entity/civilian/BannerModStarterWorkerReadinessGameTests.java b/src/gametest/java/com/talhanation/bannermod/entity/civilian/BannerModStarterWorkerReadinessGameTests.java
index e6416dc8..5e2a84c6 100644
--- a/src/gametest/java/com/talhanation/bannermod/entity/civilian/BannerModStarterWorkerReadinessGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/entity/civilian/BannerModStarterWorkerReadinessGameTests.java
@@ -13,7 +13,7 @@
import com.talhanation.bannermod.settlement.bootstrap.SettlementBootstrapService;
import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
-import com.talhanation.bannermod.settlement.validation.DefaultBuildingValidator;
+import com.talhanation.bannermod.settlement.validation.SettlementBuildingValidator;
import net.minecraft.core.BlockPos;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
@@ -99,7 +99,11 @@ private static <T extends AbstractWorkerEntity> T singleWorker(GameTestHelper he
private static void assertIdleReason(GameTestHelper helper, AbstractWorkerEntity worker, String expectedReason) {
WorkerControlStatus status = worker.controlAccess().workStatus();
helper.assertTrue(status.kind() == WorkerControlStatus.Kind.IDLE,
- "Expected idle work status for " + worker.getName().getString() + ".");
+ "Expected idle work status for " + worker.getClass().getSimpleName() + " " + worker.getName().getString()
+ + ", got kind=" + status.kind() + ", reason=" + status.reasonToken()
+ + ", shouldWork=" + worker.shouldWork()
+ + ", needsSleep=" + worker.needsToSleep()
+ + ", currentWorkArea=" + worker.getCurrentWorkArea() + ".");
helper.assertTrue(expectedReason.equals(status.reasonToken()),
"Expected idle reason " + expectedReason + " for " + worker.getName().getString() + ", got " + status.reasonToken() + ".");
}
diff --git a/src/gametest/java/com/talhanation/bannermod/entity/military/perks/BannerModSkillTreePersistenceGameTests.java b/src/gametest/java/com/talhanation/bannermod/entity/military/perks/BannerModSkillTreePersistenceGameTests.java
new file mode 100644
index 00000000..7332df51
--- /dev/null
+++ b/src/gametest/java/com/talhanation/bannermod/entity/military/perks/BannerModSkillTreePersistenceGameTests.java
@@ -0,0 +1,116 @@
+package com.talhanation.bannermod.entity.military.perks;
+
+import com.mojang.authlib.GameProfile;
+import com.talhanation.bannermod.BannerModDedicatedServerGameTestSupport;
+import com.talhanation.bannermod.bootstrap.BannerModMain;
+import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
+import com.talhanation.bannermod.gametest.support.RecruitsBattleGameTestSupport;
+import com.talhanation.bannermod.registry.military.ModEntityTypes;
+import net.minecraft.core.BlockPos;
+import net.minecraft.gametest.framework.GameTest;
+import net.minecraft.gametest.framework.GameTestHelper;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.neoforged.neoforge.common.util.FakePlayer;
+import net.neoforged.neoforge.gametest.GameTestHolder;
+import net.neoforged.neoforge.gametest.PrefixGameTestTemplate;
+
+import java.util.UUID;
+
+@GameTestHolder(BannerModMain.MOD_ID)
+public class BannerModSkillTreePersistenceGameTests {
+ private static final UUID RECRUIT_OWNER_UUID = UUID.fromString("00000000-0000-0000-0000-000000002c01");
+ private static final UUID PLAYER_UUID = UUID.fromString("00000000-0000-0000-0000-000000002c02");
+ private static final String RECRUIT_PERK_ID = "universal/toughness_i";
+ private static final String PLAYER_PERK_ID = "swordsman/iron_grip_i";
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void recruitPerksAndSkillPointsSurviveSaveLoad(GameTestHelper helper) {
+ AbstractRecruitEntity recruit = RecruitsBattleGameTestSupport.spawnConfiguredRecruit(
+ helper,
+ ModEntityTypes.RECRUIT.get(),
+ new BlockPos(1, 2, 1),
+ "skilltree-recruit",
+ RECRUIT_OWNER_UUID
+ );
+ PerkNode node = PerkRegistry.get(RECRUIT_PERK_ID).orElseThrow();
+ recruit.getPerkProgress().grantPoints(3);
+ helper.assertTrue(recruit.getPerkProgress().unlock(node) == PerkProgress.UnlockResult.OK,
+ "Expected recruit test perk to unlock before save");
+
+ CompoundTag saved = BannerModDedicatedServerGameTestSupport.saveEntity(recruit);
+ recruit.discard();
+ AbstractRecruitEntity reloaded = BannerModDedicatedServerGameTestSupport.loadEntity(
+ helper,
+ ModEntityTypes.RECRUIT.get(),
+ new BlockPos(2, 2, 1),
+ saved
+ );
+
+ helper.assertTrue(reloaded.getPerkProgress().isOwned(RECRUIT_PERK_ID),
+ "Expected recruit unlocked perk to survive save/load");
+ helper.assertTrue(reloaded.getPerkProgress().getAvailablePoints() == 2,
+ "Expected recruit skill points to survive save/load");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void playerAttachmentPerksAndSkillPointsSurviveSaveLoad(GameTestHelper helper) {
+ ServerLevel level = helper.getLevel();
+ ServerPlayer player = (ServerPlayer) BannerModDedicatedServerGameTestSupport.createPositionedFakeServerPlayer(
+ level,
+ PLAYER_UUID,
+ "skilltree-player",
+ helper.absolutePos(new BlockPos(1, 2, 2))
+ );
+ PlayerPerkProgressService.grantLevelPoints(player, 3);
+ helper.assertTrue(PlayerPerkProgressService.unlock(player, PLAYER_PERK_ID) == PerkProgress.UnlockResult.OK,
+ "Expected player test perk to unlock before save");
+
+ CompoundTag saved = BannerModDedicatedServerGameTestSupport.saveEntity(player);
+ ServerPlayer reloaded = new FakePlayer(level, new GameProfile(UUID.fromString("00000000-0000-0000-0000-000000002c03"), "skilltree-reloaded"));
+ reloaded.load(saved);
+
+ PerkProgress restored = PlayerPerkProgressService.progress(reloaded);
+ helper.assertTrue(restored.isOwned(PLAYER_PERK_ID),
+ "Expected player attachment unlocked perk to survive save/load");
+ helper.assertTrue(restored.getAvailablePoints() == 2,
+ "Expected player attachment skill points to survive save/load");
+ helper.succeed();
+ }
+
+ @PrefixGameTestTemplate(false)
+ @GameTest(template = "harness_empty")
+ public static void respecRefundsPointsWithoutChangingXpOrLevel(GameTestHelper helper) {
+ AbstractRecruitEntity recruit = RecruitsBattleGameTestSupport.spawnConfiguredRecruit(
+ helper,
+ ModEntityTypes.RECRUIT.get(),
+ new BlockPos(1, 2, 3),
+ "skilltree-respec-recruit",
+ RECRUIT_OWNER_UUID
+ );
+ recruit.setXpLevel(7);
+ recruit.setXp(42);
+ PerkNode node = PerkRegistry.get(RECRUIT_PERK_ID).orElseThrow();
+ recruit.getPerkProgress().grantPoints(2);
+ helper.assertTrue(recruit.getPerkProgress().unlock(node) == PerkProgress.UnlockResult.OK,
+ "Expected recruit test perk to unlock before respec");
+
+ int refund = recruit.getPerkProgress().respec();
+
+ helper.assertTrue(refund == node.pointCost(),
+ "Expected respec to refund the unlocked perk cost");
+ helper.assertTrue(recruit.getPerkProgress().getAvailablePoints() == 2,
+ "Expected respec to restore spent skill points");
+ helper.assertTrue(recruit.getPerkProgress().getOwnedPerks().isEmpty(),
+ "Expected respec to clear unlocked perks");
+ helper.assertTrue(recruit.getXpLevel() == 7,
+ "Expected respec to preserve recruit XP level");
+ helper.assertTrue(recruit.getXp() == 42,
+ "Expected respec to preserve recruit XP progress");
+ helper.succeed();
+ }
+}
diff --git a/src/gametest/java/com/talhanation/bannermod/gametest/support/RecruitsBattleGameTestSupport.java b/src/gametest/java/com/talhanation/bannermod/gametest/support/RecruitsBattleGameTestSupport.java
index a970f8a2..2ff5e353 100644
--- a/src/gametest/java/com/talhanation/bannermod/gametest/support/RecruitsBattleGameTestSupport.java
+++ b/src/gametest/java/com/talhanation/bannermod/gametest/support/RecruitsBattleGameTestSupport.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.gametest.support;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.BowmanEntity;
import com.talhanation.bannermod.entity.military.CrossBowmanEntity;
diff --git a/src/gametest/java/com/talhanation/bannermod/network/messages/PacketAuthorityGameTests.java b/src/gametest/java/com/talhanation/bannermod/network/messages/PacketAuthorityGameTests.java
index 58598c0d..ebf57fdd 100644
--- a/src/gametest/java/com/talhanation/bannermod/network/messages/PacketAuthorityGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/network/messages/PacketAuthorityGameTests.java
@@ -6,7 +6,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.entity.civilian.workarea.StorageArea;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.gametest.support.PacketGameTestSupport;
import com.talhanation.bannermod.gametest.support.RecruitsBattleGameTestSupport;
import com.talhanation.bannermod.network.messages.civilian.MessageUpdateOwner;
diff --git a/src/gametest/java/com/talhanation/bannermod/network/messages/military/GroupAssignmentAuthorityGameTests.java b/src/gametest/java/com/talhanation/bannermod/network/messages/military/GroupAssignmentAuthorityGameTests.java
index 59601d38..75f44de2 100644
--- a/src/gametest/java/com/talhanation/bannermod/network/messages/military/GroupAssignmentAuthorityGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/network/messages/military/GroupAssignmentAuthorityGameTests.java
@@ -3,7 +3,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.entity.military.AbstractLeaderEntity;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.gametest.support.RecruitsBattleGameTestSupport;
import com.talhanation.bannermod.gametest.support.RecruitsCommandGameTestSupport;
import com.talhanation.bannermod.BannerModDedicatedServerGameTestSupport;
diff --git a/src/gametest/java/com/talhanation/bannermod/persistence/ChunkUnloadReloadRoundtripGameTests.java b/src/gametest/java/com/talhanation/bannermod/persistence/ChunkUnloadReloadRoundtripGameTests.java
index 9c054a03..2db6ab62 100644
--- a/src/gametest/java/com/talhanation/bannermod/persistence/ChunkUnloadReloadRoundtripGameTests.java
+++ b/src/gametest/java/com/talhanation/bannermod/persistence/ChunkUnloadReloadRoundtripGameTests.java
@@ -6,8 +6,8 @@
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
import com.talhanation.bannermod.persistence.military.RecruitsClaimSaveData;
import com.talhanation.bannermod.persistence.military.RecruitsPlayerInfo;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import net.minecraft.core.HolderLookup;
import net.minecraft.gametest.framework.GameTest;
import net.minecraft.gametest.framework.GameTestHelper;
@@ -48,7 +48,7 @@
* roundtrip test ({@code claimRoundtripTagIsByteForByteIdentical}).</li>
* <li>Settlement snapshot's serialized tag via {@code toTag}/{@code equals}
* — covered both at the record level and through the
- * {@link BannerModSettlementManager} SavedData.</li>
+ * {@link SettlementManager} SavedData.</li>
* <li>Treasury ledger — covered by the
* {@link BannerModTreasuryManager} roundtrip test.</li>
* <li>Per-chunk SavedData — the three SavedData entries above are the
@@ -67,7 +67,7 @@ public class ChunkUnloadReloadRoundtripGameTests {
@GameTest(template = "harness_empty")
public static void settlementSnapshotTagIsByteForByteIdenticalAfterRoundtrip(GameTestHelper helper) {
UUID claimUuid = UUID.fromString("11111111-2222-3333-4444-555555555555");
- BannerModSettlementSnapshot snapshot = BannerModSettlementSnapshot.create(
+ SettlementSnapshot snapshot = SettlementSnapshot.create(
claimUuid,
ANCHOR_CHUNK,
"test-faction"
@@ -77,7 +77,7 @@ public static void settlementSnapshotTagIsByteForByteIdenticalAfterRoundtrip(Gam
CompoundTag preUnloadTag = snapshot.toTag();
// Simulated unload + reload: re-hydrate via the production fromTag entry.
- BannerModSettlementSnapshot reloaded = BannerModSettlementSnapshot.fromTag(preUnloadTag);
+ SettlementSnapshot reloaded = SettlementSnapshot.fromTag(preUnloadTag);
// Post-reload: re-serialize through the same toTag entry point.
CompoundTag postReloadTag = reloaded.toTag();
@@ -199,12 +199,12 @@ public static void claimSettlementAndTreasuryAllSurviveSimulatedChunkUnloadReloa
RecruitsClaimSaveData claimData = new RecruitsClaimSaveData();
claimData.setAllClaims(List.of(claim));
- BannerModSettlementSnapshot snapshot = BannerModSettlementSnapshot.create(
+ SettlementSnapshot snapshot = SettlementSnapshot.create(
coherentClaimUuid,
ANCHOR_CHUNK,
"test-faction"
);
- BannerModSettlementManager settlementManager = new BannerModSettlementManager();
+ SettlementManager settlementManager = new SettlementManager();
settlementManager.putSnapshot(snapshot);
BannerModTreasuryLedgerSnapshot ledger = BannerModTreasuryLedgerSnapshot
@@ -222,8 +222,8 @@ public static void claimSettlementAndTreasuryAllSurviveSimulatedChunkUnloadReloa
// ----- Simulated chunk unload/reload: production load() then save() again.
RecruitsClaimSaveData claimReloaded =
RecruitsClaimSaveData.load(claimPreTag, registries);
- BannerModSettlementManager settlementReloaded =
- BannerModSettlementManager.load(settlementPreTag, registries);
+ SettlementManager settlementReloaded =
+ SettlementManager.load(settlementPreTag, registries);
BannerModTreasuryManager treasuryReloaded =
BannerModTreasuryManager.load(treasuryPreTag, registries);
@@ -236,7 +236,7 @@ public static void claimSettlementAndTreasuryAllSurviveSimulatedChunkUnloadReloa
helper.assertTrue(reloadedClaim.containsChunk(ANCHOR_CHUNK),
"Claim chunk coord must survive unload/reload");
- BannerModSettlementSnapshot reloadedSnapshot = settlementReloaded.getSnapshot(coherentClaimUuid);
+ SettlementSnapshot reloadedSnapshot = settlementReloaded.getSnapshot(coherentClaimUuid);
helper.assertTrue(reloadedSnapshot != null,
"Settlement snapshot must be reachable by claim UUID after reload");
helper.assertTrue(snapshotPreTag.equals(reloadedSnapshot.toTag()),
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/AnimalFarmerWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/AnimalFarmerWorkGoal.java
deleted file mode 100644
index 5ab19966..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/AnimalFarmerWorkGoal.java
+++ /dev/null
@@ -1,614 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.talhanation.bannermod.entity.civilian.AnimalFarmerEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.workarea.AnimalPenArea;
-import com.talhanation.bannermod.persistence.civilian.NeededItem;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.animal.Animal;
-import net.minecraft.world.entity.animal.Sheep;
-import net.minecraft.world.entity.projectile.ThrownEgg;
-import net.minecraft.world.item.AxeItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.phys.Vec3;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-public class AnimalFarmerWorkGoal extends Goal {
-
- private static final int AREA_SEARCH_COOLDOWN_TICKS = 20;
- private static final int PATH_REQUEST_COOLDOWN_TICKS = 20;
-
- public AnimalFarmerEntity animalFarmerEntity;
- public State state;
- public boolean errorMessageDone;
- public Animal animal;
- public AnimalPenArea.AnimalTypes animalType;
- public int amountToBreed;
- public int amountToSlaughter;
- public Stack<Animal> stackOfAnimals = new Stack<>();
- public List<NeededItem> neededItems = new ArrayList<>();
- public int time;
- public boolean isHolding;
- private int lastAreaSearchTick = -AREA_SEARCH_COOLDOWN_TICKS;
- private int lastPathRequestTick = -PATH_REQUEST_COOLDOWN_TICKS;
- @Nullable
- private Vec3 lastPathRequestPos;
-
- public AnimalFarmerWorkGoal(AnimalFarmerEntity animalFarmerEntity) {
- this.animalFarmerEntity = animalFarmerEntity;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
-
- @Override
- public boolean canUse() {
- return !animalFarmerEntity.needsToSleep() && animalFarmerEntity.shouldWork() && !animalFarmerEntity.needsToGetToChest();
- }
-
- @Override
- public void start() {
- super.start();
- if(this.animalFarmerEntity.getCommandSenderWorld().isClientSide()) return;
- animalFarmerEntity.setAggroState(3);
- setState(State.SELECT_WORK_AREA);
- }
-
- @Override
- public void stop() {
- super.stop();
- animalFarmerEntity.setAggroState(0);
- clearCurrentPenBusyState();
- }
-
- @Override
- public void tick() {
- super.tick();
- if(this.animalFarmerEntity.getCommandSenderWorld().isClientSide()) return;
- if(state == null) return;
- if(state != State.SELECT_WORK_AREA && !hasUsableCurrentPen()) {
- discardInvalidCurrentPen();
- setState(State.SELECT_WORK_AREA);
- return;
- }
- if(animal != null) this.animalFarmerEntity.getLookControl().setLookAt(animal);
- if(this.animalFarmerEntity.tickCount % 20 != 0) return;
-
- switch(state){
- case SELECT_WORK_AREA ->{
- if(hasUsableCurrentPen()) {
- prepareCurrentPen();
- setState(State.MOVE_TO_WORK_AREA);
- return;
- }
-
- discardInvalidCurrentPen();
-
- if(animalFarmerEntity.tickCount - lastAreaSearchTick < AREA_SEARCH_COOLDOWN_TICKS) return;
- lastAreaSearchTick = animalFarmerEntity.tickCount;
-
- List<AnimalPenArea> areas = getAvailableWorkAreasByPriority((ServerLevel) animalFarmerEntity.getCommandSenderWorld(), animalFarmerEntity, animalFarmerEntity.getCurrentAnimalPen());
-
- if (!areas.isEmpty()) {
- this.animalFarmerEntity.setCurrentWorkArea(areas.get(0));
- }
-
- if(this.animalFarmerEntity.getCurrentAnimalPen() == null) {
- animalFarmerEntity.reportIdleReason("animal_farmer_no_pen", Component.literal(animalFarmerEntity.getName().getString() + ": Waiting for an animal pen."));
- return;
- }
-
- prepareCurrentPen();
-
- setState(State.MOVE_TO_WORK_AREA);
- }
-
- case MOVE_TO_WORK_AREA ->{
- this.animal = null;
- if(this.moveToPosition(animalFarmerEntity.getCurrentAnimalPen().position(), 100)) return;
-
- setState(State.MOVE_TO_CENTER);
- }
-
- case MOVE_TO_CENTER ->{
- this.animal = null;
- if(this.moveToPosition(animalFarmerEntity.getCurrentAnimalPen().position(), 30)) return;
-
- setState(State.PREPARE_BREED);
- }
-
- case PREPARE_BREED -> {
- if(!animalFarmerEntity.getCurrentAnimalPen().getBreed() || !animalFarmerEntity.getCurrentAnimalPen().isBreedTime()){
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- animalFarmerEntity.getCurrentAnimalPen().getSpecial(), 1,
- animalType == AnimalPenArea.AnimalTypes.CHICKEN,
- animalFarmerEntity.getCurrentAnimalPen().getSlaughter(),
- animalFarmerEntity.getCurrentAnimalPen().animalsToSlaughter.size(),
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- return;
- }
-
- animalFarmerEntity.getCurrentAnimalPen().scanAnimalBreed();
- this.stackOfAnimals = animalFarmerEntity.getCurrentAnimalPen().animalsToBreed;
-
- if(stackOfAnimals.isEmpty()){
- setState(State.PREPARE_SPECIAL_TASK);
- return;
- }
-
- amountToBreed = stackOfAnimals.size();
- amountToBreed -= amountToBreed % 2;
-
- Item breedItem = animalType.getBreedItem();
- animalFarmerEntity.switchMainHandItem(itemStack -> itemStack.is(breedItem));
- ItemStack mainHandItem = animalFarmerEntity.getMainHandItem();
-
- boolean hasBreedItem = mainHandItem.is(breedItem);
- if(!hasBreedItem){
- animalFarmerEntity.requestRequiredItem(new NeededItem(stack -> stack.is(breedItem), amountToBreed, true),
- "animal_farmer_missing_breed_item",
- Component.literal(animalFarmerEntity.getName().getString() + ": I need breeding items to continue."));
- this.animal = null;
- applyLoopDecision(AnimalFarmerLoopProgress.waitForRequiredItem(AnimalFarmerLoopProgress.Action.PREPARE_BREED));
- return;
- }
-
- setState(State.BREED);
- }
-
- case BREED -> {
- if(animalFarmerEntity.getCurrentAnimalPen().getBreed() && animalFarmerEntity.getCurrentAnimalPen().isBreedTime() && this.breed()) return;
-
- this.animalFarmerEntity.getCurrentAnimalPen().setBreedTime(2000);
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- animalFarmerEntity.getCurrentAnimalPen().getSpecial(), 1,
- animalType == AnimalPenArea.AnimalTypes.CHICKEN,
- animalFarmerEntity.getCurrentAnimalPen().getSlaughter(),
- animalFarmerEntity.getCurrentAnimalPen().animalsToSlaughter.size(),
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- }
-
- case PREPARE_SPECIAL_TASK -> {
- if(!animalFarmerEntity.getCurrentAnimalPen().getSpecial()){
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- false, 0, false,
- animalFarmerEntity.getCurrentAnimalPen().getSlaughter(),
- animalFarmerEntity.getCurrentAnimalPen().animalsToSlaughter.size(),
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- return;
- }
-
- if(!animalFarmerEntity.hasFreeInvSlot()){
- animalFarmerEntity.forcedDeposit = true;
- applyLoopDecision(AnimalFarmerLoopProgress.waitForDeposit(AnimalFarmerLoopProgress.Action.PREPARE_SPECIAL_TASK));
- return;
- }
-
- this.animalFarmerEntity.getCurrentAnimalPen().scanAnimalSpecial();
- this.stackOfAnimals = animalFarmerEntity.getCurrentAnimalPen().animalsForSpecialTask;
-
- if(stackOfAnimals.isEmpty() && animalType != AnimalPenArea.AnimalTypes.CHICKEN){
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- false, 0, false,
- animalFarmerEntity.getCurrentAnimalPen().getSlaughter(),
- animalFarmerEntity.getCurrentAnimalPen().animalsToSlaughter.size(),
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- return;
- }
- setState(State.SPECIAL_TASK);
- }
-
- case SPECIAL_TASK -> {
- if(animalFarmerEntity.getCurrentAnimalPen().getSpecial() && this.doSpecialTask()) return;
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- false, 0, false,
- animalFarmerEntity.getCurrentAnimalPen().getSlaughter(),
- animalFarmerEntity.getCurrentAnimalPen().animalsToSlaughter.size(),
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- }
-
- case PREPARE_SLAUGHTER -> {
- if(!animalFarmerEntity.getCurrentAnimalPen().getSlaughter()){
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- false, 0, false,
- false, 0,
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- return;
- }
-
- if(!animalFarmerEntity.hasFreeInvSlot()){
- animalFarmerEntity.forcedDeposit = true;
- applyLoopDecision(AnimalFarmerLoopProgress.waitForDeposit(AnimalFarmerLoopProgress.Action.PREPARE_SLAUGHTER));
- return;
- }
-
- this.animalFarmerEntity.getCurrentAnimalPen().scanAnimalSlaughter();
- this.stackOfAnimals = animalFarmerEntity.getCurrentAnimalPen().animalsToSlaughter;
-
- int max = animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals();
- int size = stackOfAnimals.size();
-
- if(max >= size){
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- false, 0, false,
- true, size,
- max));
- return;
- }
-
- amountToSlaughter = size - max;
-
- animalFarmerEntity.switchMainHandItem(itemStack -> itemStack.getItem() instanceof AxeItem);
-
- boolean hasAxe = animalFarmerEntity.getMainHandItem().getItem() instanceof AxeItem;
- if(!hasAxe){
- animalFarmerEntity.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof AxeItem, 1, true),
- "animal_farmer_missing_axe",
- Component.literal(animalFarmerEntity.getName().getString() + ": I need an axe to continue."));
- this.animal = null;
- applyLoopDecision(AnimalFarmerLoopProgress.waitForRequiredItem(AnimalFarmerLoopProgress.Action.PREPARE_SLAUGHTER));
- return;
- }
-
- setState(State.SLAUGHTER);
- }
- case SLAUGHTER -> {
- if(animalFarmerEntity.getCurrentAnimalPen().getSlaughter() && this.slaughter()) return;
-
- applyLoopDecision(AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
- false, 0, false,
- false, 0,
- animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals()));
- }
-
- case DONE -> {
- finishCurrentPen();
- animalFarmerEntity.switchMainHandItem(ItemStack::isEmpty);
- animalFarmerEntity.clearWorkStatus();
- setState(State.SELECT_WORK_AREA);
-
- if(!this.neededItems.isEmpty()){
- for(NeededItem neededItem : neededItems){
- this.animalFarmerEntity.addNeededItem(neededItem);
- }
- this.neededItems.clear();
- }
- }
-
- case ERROR ->{
- if(!errorMessageDone){
- errorMessageDone = true;
- }
-
- if(++time > 1000){
- time = 0;
- this.start();
- }
-
- }
- }
- }
-
- private boolean breed() {
- if(this.animal == null) {
- if(!stackOfAnimals.isEmpty()) animal = stackOfAnimals.pop();
- else return false;
- }
- if(this.moveToPosition(animal.position(), 6)) return true;
- this.animalFarmerEntity.getLookControl().setLookAt(animal);
-
- Item breedItem = animalType.getBreedItem();
- animalFarmerEntity.switchMainHandItem(itemStack -> itemStack.is(breedItem));
- ItemStack mainHandItem = animalFarmerEntity.getMainHandItem();
-
- boolean hasBreedItem = mainHandItem.is(breedItem);
- if(!hasBreedItem){
- animalFarmerEntity.addNeededItem(new NeededItem(stack -> stack.is(breedItem), amountToBreed, false));
- this.animal = null;
- return false;
- }
-
- this.animalFarmerEntity.swing(InteractionHand.MAIN_HAND);
- this.animalFarmerEntity.getMainHandItem().shrink(1);
- amountToBreed--;
- animal.setAge(0);
-
- animal.setInLove(null);
-
- this.animal = null;
- return true;
- }
-
- private boolean doSpecialTask() {
- Item specialItem = animalType.getSpecialItem();
-
- animalFarmerEntity.switchMainHandItem(itemStack -> itemStack.is(specialItem));
-
- ItemStack mainHandItem = animalFarmerEntity.getMainHandItem();
-
- boolean hasSpecialItem = mainHandItem.is(specialItem);
- if(!hasSpecialItem){
- boolean chicken = animalType == AnimalPenArea.AnimalTypes.CHICKEN;
-
- animalFarmerEntity.requestRequiredItem(new NeededItem(stack -> stack.is(specialItem), chicken ? 32 : 1, !chicken),
- "animal_farmer_missing_special_item",
- Component.literal(animalFarmerEntity.getName().getString() + ": I need the right tool or item to continue."));
- this.animal = null;
- applyLoopDecision(AnimalFarmerLoopProgress.waitForRequiredItem(AnimalFarmerLoopProgress.Action.PREPARE_SPECIAL_TASK));
- return true;
- }
- if(animalType == AnimalPenArea.AnimalTypes.CHICKEN){
-
- return throwEggs();
- }
-
- if(this.animal == null) {
- if(!stackOfAnimals.isEmpty()) animal = stackOfAnimals.pop();
- else return false;
- }
- if(this.moveToPosition(animal.position(), 6)) return true;
-
- if(animalType == AnimalPenArea.AnimalTypes.SHEEP){
- return sheerSheep();
- } else if (animalType == AnimalPenArea.AnimalTypes.COW) {
- return milkCow();
- }
-
- return false;
- }
-
- public boolean slaughter() {
- animalFarmerEntity.switchMainHandItem(itemStack -> itemStack.getItem() instanceof AxeItem);
-
- boolean hasAxe = animalFarmerEntity.getMainHandItem().getItem() instanceof AxeItem;
- if(!hasAxe){
- animalFarmerEntity.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof AxeItem, 1, true),
- "animal_farmer_missing_axe",
- Component.literal(animalFarmerEntity.getName().getString() + ": I need an axe to continue."));
- this.animal = null;
- applyLoopDecision(AnimalFarmerLoopProgress.waitForRequiredItem(AnimalFarmerLoopProgress.Action.PREPARE_SLAUGHTER));
- return false;
- }
-
- int max = animalFarmerEntity.getCurrentAnimalPen().getMaxAnimals();
- int size = stackOfAnimals.size();
-
- if(max >= size || amountToSlaughter == 0){
- setState(State.DONE);
- return false;
- }
-
- if(this.animal == null) {
- if(!stackOfAnimals.isEmpty()) animal = stackOfAnimals.pop();
- else return false;
- }
-
- if(this.moveToPosition(animal.position(), 6)) return true;
- this.animalFarmerEntity.getLookControl().setLookAt(animal);
-
- animalFarmerEntity.playSound(SoundEvents.PLAYER_ATTACK_STRONG);
- this.animalFarmerEntity.swing(InteractionHand.MAIN_HAND);
-
- animal.kill();
- amountToSlaughter--;
-
- animalFarmerEntity.damageMainHandItem();
-
- animal = null;
- return true;
- }
-
-
- private boolean throwEggs() {
- if(!this.animalFarmerEntity.getMainHandItem().is(Items.EGG)){
- return false;
- }
- if(this.moveToPosition(animalFarmerEntity.getCurrentAnimalPen().getArea().getCenter(), 10)){
- return true;
- }
-
- animalFarmerEntity.getCommandSenderWorld().playSound(null, animalFarmerEntity.getX(), animalFarmerEntity.getY(), animalFarmerEntity.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5F, 0.4F / (animalFarmerEntity.getRandom().nextFloat() * 0.4F + 0.8F));
- ThrownEgg thrownegg = new ThrownEgg(animalFarmerEntity.getCommandSenderWorld(), animalFarmerEntity);
- thrownegg.setItem(new ItemStack(Items.EGG));
-
- double d0 = animalFarmerEntity.getCurrentAnimalPen().getArea().getCenter().x() - this.animalFarmerEntity.getX();
- double d2 = animalFarmerEntity.getCurrentAnimalPen().getArea().getCenter().z() - this.animalFarmerEntity.getZ();
-
- thrownegg.shoot(d0, 0, d2, 0.1F, 0F);
-
- if(animalFarmerEntity.getCommandSenderWorld().addFreshEntity(thrownegg)){
- this.animalFarmerEntity.getMainHandItem().shrink(1);
- }
-
- return true;
- }
-
- public boolean sheerSheep() {
- if(animal == null) return false;
-
- if(animal instanceof Sheep sheep){
- sheep.shear(SoundSource.PLAYERS);
- sheep.setSheared(true);
-
- this.animalFarmerEntity.swing(InteractionHand.MAIN_HAND);
- this.animalFarmerEntity.damageMainHandItem();
- }
- this.animal = null;
- return true;
- }
-
- public boolean milkCow() {
- if(animal == null) return false;
-
- animalFarmerEntity.getMainHandItem().shrink(1);
- animalFarmerEntity.getInventory().addItem(Items.MILK_BUCKET.getDefaultInstance());
- animal.playSound(SoundEvents.COW_MILK, 1.0F, 1.0F);
-
- animal = null;
- return true;
- }
-
- public void setState(State state) {
- this.state = state;
- }
-
- private void applyLoopDecision(AnimalFarmerLoopProgress.Decision decision) {
- if (decision == null) {
- return;
- }
-
- switch (decision.action()) {
- case PREPARE_BREED -> setState(State.PREPARE_BREED);
- case PREPARE_SPECIAL_TASK -> setState(State.PREPARE_SPECIAL_TASK);
- case PREPARE_SLAUGHTER -> setState(State.PREPARE_SLAUGHTER);
- case WAIT_FOR_ITEM, WAIT_FOR_DEPOSIT -> setState(mapActionToState(decision.resumeAction()));
- case FINISHED -> setState(State.DONE);
- }
- }
-
- private State mapActionToState(AnimalFarmerLoopProgress.Action action) {
- return switch (action) {
- case PREPARE_BREED -> State.PREPARE_BREED;
- case PREPARE_SPECIAL_TASK -> State.PREPARE_SPECIAL_TASK;
- case PREPARE_SLAUGHTER -> State.PREPARE_SLAUGHTER;
- case WAIT_FOR_ITEM, WAIT_FOR_DEPOSIT, FINISHED -> state;
- };
- }
-
- private boolean hasUsableCurrentPen() {
- return this.animalFarmerEntity.getCurrentAnimalPen() != null
- && !this.animalFarmerEntity.getCurrentAnimalPen().isRemoved()
- && this.animalFarmerEntity.getCurrentAnimalPen().canWorkHere(this.animalFarmerEntity);
- }
-
- private void prepareCurrentPen() {
- if (!hasUsableCurrentPen()) {
- return;
- }
-
- animalFarmerEntity.clearWorkStatus();
- this.animalFarmerEntity.getCurrentAnimalPen().setBeingWorkedOn(true);
- this.animalFarmerEntity.getCurrentAnimalPen().setTime(0);
- this.animalType = this.animalFarmerEntity.getCurrentAnimalPen().getAnimalType();
- }
-
- private void clearCurrentPenBusyState() {
- if (this.animalFarmerEntity.getCurrentAnimalPen() != null) {
- this.animalFarmerEntity.getCurrentAnimalPen().setBeingWorkedOn(false);
- }
- }
-
- private void discardInvalidCurrentPen() {
- clearCurrentPenBusyState();
- this.animalFarmerEntity.setCurrentWorkArea(null);
- this.animal = null;
- }
-
- private void finishCurrentPen() {
- clearCurrentPenBusyState();
- this.animalFarmerEntity.setCurrentWorkArea(null);
- this.animal = null;
- }
-
- @Override
- public boolean canContinueToUse() {
- return canUse() || this.isHolding;
- }
-
- @Override
- public boolean isInterruptable() {
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick() {
- return true;
- }
-
- public static List<AnimalPenArea> getAvailableWorkAreasByPriority(ServerLevel level, AnimalFarmerEntity animalFarmerEntity, @Nullable AnimalPenArea currentArea) {
- List<AnimalPenArea> list = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(animalFarmerEntity, 64, AnimalPenArea.class);
-
- Map<AnimalPenArea, Integer> priorityMap = new HashMap<>();
-
- for (AnimalPenArea area : list) {
- if (area == null || area == currentArea || !area.canWorkHere(animalFarmerEntity)) continue;
-
- int priority = 0;
-
- boolean perfectCandidate = area.isWorkerPerfectCandidate(animalFarmerEntity);
-
- if (perfectCandidate) {
- priority += 10;
- } else {
- priority += 1;
- }
-
- if (!area.isBeingWorkedOn()) {
- priority += 3;
- }
-
- priority += area.time;
- priority += WorkerBindingResume.priorityBoost(animalFarmerEntity.getBoundWorkAreaUUID(), area.getUUID());
-
- priorityMap.put(area, priority);
- }
-
- List<AnimalPenArea> sorted = new ArrayList<>(priorityMap.keySet());
- sorted.sort((a, b) -> Integer.compare(priorityMap.get(b), priorityMap.get(a)));
-
- return sorted;
- }
-
- public boolean moveToPosition(Vec3 pos, int threshold){
- if(pos == null){
- return false;
- }
- else{
- double distance = animalFarmerEntity.getHorizontalDistanceTo(pos);
- if(distance < threshold){
- lastPathRequestPos = null;
- return false;
- }
- else{
- if(shouldRequestPath(pos)){
- animalFarmerEntity.getNavigation().moveTo(pos.x(), pos.y(), pos.z(), 0.8F);
- }
- animalFarmerEntity.setFollowState(6); //Working
- animalFarmerEntity.getLookControl().setLookAt(pos);
- }
- return true;
- }
- }
-
- private boolean shouldRequestPath(Vec3 pos) {
- if(!pos.equals(lastPathRequestPos) || animalFarmerEntity.tickCount - lastPathRequestTick >= PATH_REQUEST_COOLDOWN_TICKS){
- lastPathRequestPos = pos;
- lastPathRequestTick = animalFarmerEntity.tickCount;
- return true;
- }
- return false;
- }
-
- public enum State{
- SELECT_WORK_AREA,
- MOVE_TO_WORK_AREA,
- MOVE_TO_CENTER,
- PREPARE_BREED,
- BREED,
- PREPARE_SLAUGHTER,
- SLAUGHTER,
- PREPARE_SPECIAL_TASK,
- SPECIAL_TASK,
- DONE,
- ERROR;
-
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/BuilderWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/BuilderWorkGoal.java
deleted file mode 100644
index 9a6e8abc..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/BuilderWorkGoal.java
+++ /dev/null
@@ -1,662 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.talhanation.bannermod.entity.civilian.BuilderEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.workarea.AbstractWorkAreaEntity;
-import com.talhanation.bannermod.entity.civilian.workarea.BuildArea;
-import com.talhanation.bannermod.persistence.civilian.BuildBlock;
-import com.talhanation.bannermod.persistence.civilian.BuildBlockParse;
-import com.talhanation.bannermod.persistence.civilian.NeededItem;
-import com.talhanation.bannermod.shared.settlement.BannerModSettlementRefreshSupport;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.DiggerItem;
-import net.minecraft.world.item.PickaxeItem;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.registries.BuiltInRegistries;
-
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class BuilderWorkGoal extends Goal {
-
- private static final int AREA_SEARCH_COOLDOWN_TICKS = 20;
- private static final int PATH_REQUEST_COOLDOWN_TICKS = 20;
-
- public BuilderEntity builderEntity;
- public State state;
- public String errorMessage;
- public boolean errorMessageDone;
- public BlockPos blockPos;
- public Stack<BlockPos> stackToBreak;
- public Stack<BlockPos> stackToPlace;
- public int minBuildHeight;
- private int lastAreaSearchTick = -AREA_SEARCH_COOLDOWN_TICKS;
- private int lastPathRequestTick = -PATH_REQUEST_COOLDOWN_TICKS;
- @Nullable
- private BlockPos lastPathRequestPos;
-
- public BuilderWorkGoal(BuilderEntity builderEntity) {
- this.builderEntity = builderEntity;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
-
- @Override
- public boolean canUse() {
- return !builderEntity.needsToSleep() && builderEntity.shouldWork() && !builderEntity.needsToGetToChest() && this.isBuildingAreaAvailable();
- }
-
- @Override
- public void start() {
- super.start();
- if(this.builderEntity.getCommandSenderWorld().isClientSide()) return;
-
-
- setState(State.SELECT_WORK_AREA);
- }
- boolean workDone;
- @Override
- public void tick() {
- super.tick();
- if(this.builderEntity.getCommandSenderWorld().isClientSide()) return;
- if(state == null) return;
- if(blockPos != null) this.builderEntity.getLookControl().setLookAt(blockPos.getCenter());
-
- if(!isBuildingAreaAvailable()) return;
-
- if(state != State.SELECT_WORK_AREA && this.builderEntity.getCurrentBuildArea() == null){
- this.blockPos = null;
- setState(State.SELECT_WORK_AREA);
- return;
- }
-
- if(blockPos != null && moveToPosition(blockPos, 40)) return;
-
- if(state == State.BREAK_BLOCKS){
- if(this.mineBlocks(this.stackToBreak)) return;
-
- setState(State.PREPARE_PLACE_BLOCKS);
- }
-
- if(builderEntity.tickCount % 5 != 0) return;
- switch(state){
- case SELECT_WORK_AREA ->{
- if(builderEntity.getCurrentBuildArea() != null) setState(State.MOVE_TO_WORK_AREA);
-
- if(builderEntity.tickCount - lastAreaSearchTick < AREA_SEARCH_COOLDOWN_TICKS) return;
- lastAreaSearchTick = builderEntity.tickCount;
-
- List<BuildArea> areas = getAvailableWorkAreasByPriority((ServerLevel) builderEntity.getCommandSenderWorld(), builderEntity, builderEntity.getCurrentBuildArea());
-
- if (!areas.isEmpty()) {
- builderEntity.setCurrentWorkArea(areas.get(0));
- }
-
- if(builderEntity.getCurrentBuildArea() == null) {
- builderEntity.reportIdleReason("builder_no_area", Component.literal(builderEntity.getName().getString() + ": Waiting for a build area."));
- return;
- }
-
- builderEntity.clearWorkStatus();
- builderEntity.getCurrentBuildArea().setBeingWorkedOn(true);
- this.builderEntity.getCurrentBuildArea().setTime(0);
- workDone = false;
- setState(State.MOVE_TO_WORK_AREA);
- }
-
- case MOVE_TO_WORK_AREA ->{
- this.blockPos = null;
- if(this.moveToPosition(builderEntity.getCurrentBuildArea().getOnPos(), 70)) return;
-
- setState(State.PREPARE_BREAK_BLOCKS);
- }
-
- case PREPARE_BREAK_BLOCKS -> {
- this.builderEntity.getCurrentBuildArea().scanBreakArea();//SOMETHING WRONG I CAN FEEL IT
-
- this.stackToBreak = this.builderEntity.getCurrentBuildArea().stackToBreak;
-
- if(stackToBreak.isEmpty()){
- setState(State.PREPARE_PLACE_BLOCKS);
- return;
- }
-
- boolean hasDigger = builderEntity.getInventory().hasAnyMatching(
- itemStack -> itemStack.getItem() instanceof DiggerItem);
- if (!hasDigger) {
- builderEntity.requestRequiredItem(new NeededItem(
- stack -> stack.getItem() instanceof PickaxeItem, 1, true),
- "builder_missing_tool",
- Component.literal(builderEntity.getName().getString() + ": I need digging tools to continue."));
- this.blockPos = null;
- return;
- }
- if (!stackToBreak.isEmpty()) {
- BlockState firstState = builderEntity.getCommandSenderWorld()
- .getBlockState(stackToBreak.peek());
- builderEntity.changeTool(firstState);
- }
- setState(State.BREAK_BLOCKS);
- }
-
- case PREPARE_PLACE_BLOCKS -> {
- if (builderEntity.getCurrentBuildArea().stackToPlace.isEmpty()) {
- if (!builderEntity.getCurrentBuildArea().stackToPlaceMultiBlock.isEmpty()) {
- setState(State.PREPARE_PLACE_MULTIBLOCK);
- } else {
- setState(State.DONE);
- }
- return;
- }
-
- minBuildHeight = (int) builderEntity.getCurrentBuildArea().getArea().maxY;
-
- for (BuildBlock bb : builderEntity.getCurrentBuildArea().stackToPlace) {
- int y = bb.getPos().getY();
- if (y < minBuildHeight) {
- minBuildHeight = y;
- }
- }
-
-
- this.stackToPlace = new Stack<>();
- for (BuildBlock buildBlock : builderEntity.getCurrentBuildArea().stackToPlace) {
- BlockPos pos = buildBlock.getPos();
- if (pos.getY() != minBuildHeight) continue;
-
- Item item = BuildBlockParse.parseBlock(buildBlock.getState().getBlock()).getItem();
- if(item == null){
- if(builderEntity.getOwner() != null) builderEntity.getOwner().sendSystemMessage(Component.literal("Could not found item for " + buildBlock.getState().getBlock().getName() + " i, will skip this block." ));
- builderEntity.getCurrentBuildArea().removeBuildBlockToPlace(pos);
- return;
- }
- else if (builderEntity.getInventory().hasAnyMatching(itemStack -> itemStack.is(item))) {
- stackToPlace.push(pos);
- }
- }
-
- if (stackToPlace.isEmpty()) {
- List<ItemStack> neededItems = builderEntity.getCurrentBuildArea().getRequiredMaterials();
- neededItems.sort(Comparator.comparingInt(ItemStack::getCount).reversed());
-
- Set<Item> allowedItems = builderEntity.getCurrentBuildArea().stackToPlace.stream()
- .filter(bb -> bb.getPos().getY() == minBuildHeight)
- .map(bb -> BuildBlockParse.parseBlock(bb.getState().getBlock()).getItem())
- .collect(Collectors.toSet());
-
- neededItems.removeIf(stack -> !allowedItems.contains(stack.getItem()));
-
- if (!neededItems.isEmpty()) {
- ItemStack neededItem = neededItems.get(0);
- int amount = Math.min(64, neededItem.getCount());
-
- builderEntity.requestRequiredItem(new NeededItem(
- itemStack -> itemStack.is(neededItem.getItem()), amount, true
- ),
- "builder_missing_materials",
- Component.literal(builderEntity.getName().getString() + ": I need more building materials."));
- }
- }
-
- setState(State.PLACE_BLOCKS);
- }
-
-
- case PLACE_BLOCKS -> {
- if(this.placeBlocks(this.stackToPlace)) return;
-
- setState(State.PREPARE_PLACE_BLOCKS);
- }
-
- case PREPARE_PLACE_MULTIBLOCK -> {
- if (builderEntity.getCurrentBuildArea().stackToPlaceMultiBlock.isEmpty()) {
- setState(State.DONE);
- return;
- }
-
- this.stackToPlace = new Stack<>();
- for (BuildBlock bb : builderEntity.getCurrentBuildArea().stackToPlaceMultiBlock) {
- stackToPlace.push(bb.getPos());
- }
-
- setState(State.PLACE_MULTIBLOCK);
- }
-
- case PLACE_MULTIBLOCK -> {
- if (this.placeMultiBlocks(this.stackToPlace)) return;
-
- setState(State.DONE);
- }
-
- case DONE -> {
- if(!workDone){
- workDone = true;
- BuildArea completedArea = builderEntity.getCurrentBuildArea();
-
- // Spawn any entities that were scanned with the structure (work areas, etc.)
- spawnScannedEntities(completedArea);
-
- completedArea.setBeingWorkedOn(false);
-
- //ONLY FOR BUILDING AREA WILL REMOVE IT
- this.builderEntity.getCurrentBuildArea().setDone(true);
- if (this.builderEntity.level() instanceof ServerLevel serverLevel) {
- BannerModSettlementRefreshSupport.refreshSnapshot(serverLevel, completedArea.blockPosition());
- }
-
- blockPos = null;
- builderEntity.setCurrentWorkArea(null);
- builderEntity.clearWorkStatus();
- this.start();
- }
- }
-
- case ERROR ->{
- if(!errorMessageDone){
- errorMessageDone = true;
- }
- }
- }
- }
-
- private boolean isBuildingAreaAvailable() {
- BuildArea area = builderEntity.getCurrentBuildArea();
- if(area == null || !area.isRemoved()) return true;
- else {
- builderEntity.setCurrentWorkArea(null);
- }
- return false;
- }
-
- public void setState(State state) {
- //if(builderEntity.getOwner() != null) builderEntity.getOwner().sendSystemMessage(Component.literal(state.toString()));
- this.state = state;
- }
-
- int blockBreakTime;
- public boolean mineBlocks(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()){
- blockPos = this.getNewMiningPosition(positions);
- }
- return blockPos != null;
- }
-
- BlockState state = builderEntity.getCommandSenderWorld().getBlockState(blockPos);
- if(state.isAir() || builderEntity.shouldIgnoreBlock(state)){
- if(!positions.isEmpty()){
- blockPos = this.getNewMiningPosition(positions);
- }
- else{
- this.blockPos = null;
- return false;
- }
- blockBreakTime = 0;
- }
- else{
- this.builderEntity.changeTool(state);
-
- this.builderEntity.mineBlock(blockPos);
- this.builderEntity.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- return false;
- }
-
- private BlockPos getNewMiningPosition(Stack<BlockPos> positions) {
- positions.sort(Comparator.comparingDouble(
- pos -> builderEntity.position().distanceToSqr(pos.getCenter())
- ));
- positions.sort(Comparator.reverseOrder());
-
- BlockPos newPosition = null;
-
- if(blockPos == null){
- positions.removeIf(pos ->
- !canSeeBlock(builderEntity.getCommandSenderWorld(), builderEntity.position().add(0, 1, 0), pos)
- );
-
- if(positions.isEmpty()){
- setState(State.MOVE_TO_WORK_AREA);
- return null;
- }
-
- newPosition = positions.pop();
- }
- else if(positions.contains(blockPos.above())){
- newPosition = blockPos.above();
- }
- else if(positions.contains(blockPos.below())){
- newPosition = blockPos.below();
- }
- else{
- newPosition = positions.pop();
- }
- positions.remove(newPosition);
- return newPosition;
- }
- /**
- * Spawns work-area entities that were recorded during the structure scan.
- * Each entity is placed at the world position corresponding to its scanned relative offset,
- * rotated from scan-facing to build-facing, and inherits the owner UUID + team of the BuildArea.
- */
- private void spawnScannedEntities(BuildArea buildArea) {
- Level level = builderEntity.getCommandSenderWorld();
- if (!(level instanceof ServerLevel serverLevel)) return;
-
- CompoundTag nbt = buildArea.getStructureNBT();
- if (nbt == null || !nbt.contains("entities", Tag.TAG_LIST)) return;
-
- ListTag entityList = nbt.getList("entities", Tag.TAG_COMPOUND);
- if (entityList.isEmpty()) return;
-
- Direction scanFacing = Direction.byName(nbt.getString("facing"));
- Direction buildFacing = buildArea.getFacing();
- Direction buildRight = buildFacing.getClockWise();
- BlockPos origin = buildArea.getOriginPos();
- int width = buildArea.getWidthSize();
-
- if (scanFacing == null) scanFacing = Direction.SOUTH;
-
- // Rotation steps: from scan-facing to build-facing (same formula as block rotation)
- int rotSteps = ((buildFacing.get2DDataValue() - scanFacing.get2DDataValue()) % 4 + 4) % 4;
-
- for (Tag t : entityList) {
- CompoundTag entityTag = (CompoundTag) t;
- String typeId = entityTag.getString("entity_type");
- int relX = entityTag.getInt("x");
- int relY = entityTag.getInt("y");
- int relZ = entityTag.getInt("z");
- int scanFacingVal = entityTag.getInt("facing");
-
- // Look up entity type
- ResourceLocation rl = ResourceLocation.parse(typeId);
- EntityType<?> entityType = BuiltInRegistries.ENTITY_TYPE.getOptional(rl).orElse(null);
- if (entityType == null) continue;
-
- // Compute world position using same formula as setStartBuild / WorkerAreaRenderer
- BlockPos worldPos = origin
- .relative(buildFacing, relZ)
- .relative(buildRight, width - 1 - relX)
- .above(relY);
-
- // Create the entity
- Entity entity = entityType.create(serverLevel);
- if (entity == null) continue;
-
- entity.moveTo(worldPos.getX() + 0.5, worldPos.getY() + 1.0, worldPos.getZ() + 0.5, 0, 0);
-
- // Apply facing rotation: rotate the scanned facing by the same rotSteps
- if (entity instanceof AbstractWorkAreaEntity wa) {
- Direction entityFacing = Direction.from2DDataValue(scanFacingVal);
- Direction rotatedFacing = rotateDirection(entityFacing, rotSteps);
- wa.setFacing(rotatedFacing);
-
- // Restore stored dimensions, swapping width↔depth for 90° / 270° rotations
- if (entityTag.contains("wa_width")) {
- int waW = entityTag.getInt("wa_width");
- int waH = entityTag.getInt("wa_height");
- int waD = entityTag.getInt("wa_depth");
- if (rotSteps % 2 == 1) { int tmp = waW; waW = waD; waD = tmp; }
- wa.setWidthSize(waW);
- wa.setHeightSize(waH);
- wa.setDepthSize(waD);
- }
-
- // Transfer owner and team from the BuildArea
- if (buildArea.getPlayerUUID() != null) {
- wa.setPlayerUUID(buildArea.getPlayerUUID());
- }
- String team = buildArea.getTeamStringID();
- if (team != null && !team.isEmpty()) {
- wa.setTeamStringID(team);
- }
-
- wa.setCustomName(Component.literal(""));
- }
-
- serverLevel.addFreshEntity(entity);
- }
- }
-
- /** Rotates a horizontal Direction clockwise by the given number of 90° steps. */
- private static Direction rotateDirection(Direction dir, int steps) {
- steps = ((steps % 4) + 4) % 4;
- for (int i = 0; i < steps; i++) dir = dir.getClockWise();
- return dir;
- }
-
- public boolean placeBlocks(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- return false;
- }
- }
-
- BlockState buildingState = builderEntity.getCurrentBuildArea().getStateFromPos(blockPos);
- BlockState levelState = builderEntity.getCommandSenderWorld().getBlockState(blockPos);
-
- if(builderEntity.getCurrentBuildArea().statesMatch(levelState, buildingState)){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- return false;
- }
- }
- else if(buildingState != null) {
- if (!levelState.isAir() && !BuildArea.canDirectlyReplace(levelState, buildingState)) {
- this.builderEntity.changeTool(levelState);
- this.builderEntity.mineBlock(blockPos);
- this.builderEntity.swing(InteractionHand.MAIN_HAND);
- return true;
- }
-
- BuildBlockParse blockParse = BuildBlockParse.parseBlock(buildingState.getBlock());
- ItemStack buildingItem = builderEntity.getMatchingItem(itemStack -> itemStack.is(blockParse.getItem()));
- if(buildingItem != null){
- if(!builderEntity.getMainHandItem().is(buildingItem.getItem())){
- builderEntity.switchMainHandItem(itemStack -> itemStack.is(buildingItem.getItem()));
- }
- //CHECK IF IT WAS PARSED TO KEEP THE BLOCK-ROTATIONS OF NOT EFFECTED ONES
- if(blockParse.wasParsed() && buildingItem.getItem() instanceof BlockItem blockItem){
- buildingState = blockItem.getBlock().defaultBlockState();
- }
-
- BlockState secondaryState = builderEntity.getCurrentBuildArea().findPairedMultiBlockState(blockPos);
- if (secondaryState != null) {
- BlockPos secondaryPos = builderEntity.getCurrentBuildArea().findPairedMultiBlockPos(blockPos);
- builderEntity.getCommandSenderWorld().setBlock(blockPos, buildingState, Block.UPDATE_CLIENTS);
- builderEntity.getCommandSenderWorld().setBlock(secondaryPos, secondaryState, Block.UPDATE_ALL);
- builderEntity.getCommandSenderWorld().blockUpdated(blockPos, buildingState.getBlock());
- builderEntity.getCurrentBuildArea().removeMultiBlockToPlace(secondaryPos);
- } else {
- builderEntity.getCommandSenderWorld().setBlockAndUpdate(blockPos, buildingState);
- }
-
- builderEntity.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), buildingState.getSoundType().getPlaceSound(), SoundSource.BLOCKS, 1.0F, 1.0F);
- this.builderEntity.swing(InteractionHand.MAIN_HAND);
- buildingItem.shrink(1);
- builderEntity.getCurrentBuildArea().removeBuildBlockToPlace(blockPos);
- }
- else{
- return false;
- }
- }
- return true;
- }
- this.blockPos = null;
- return false;
- }
-
-
- public boolean placeMultiBlocks(Stack<BlockPos> positions) {
- if (positions == null || positions.isEmpty()) {
- this.blockPos = null;
- return false;
- }
-
- if (blockPos == null) {
- blockPos = positions.pop();
- }
-
- BlockState buildingState = builderEntity.getCurrentBuildArea().getStateFromMultiBlockPos(blockPos);
- if (buildingState != null) {
- BlockState levelState = builderEntity.getCommandSenderWorld().getBlockState(blockPos);
- if (!levelState.equals(buildingState)) {
- builderEntity.getCommandSenderWorld().setBlockAndUpdate(blockPos, buildingState);
- builderEntity.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(),
- buildingState.getSoundType().getPlaceSound(), SoundSource.BLOCKS, 1.0F, 1.0F);
- builderEntity.swing(InteractionHand.MAIN_HAND);
- }
- builderEntity.getCurrentBuildArea().removeMultiBlockToPlace(blockPos);
- }
-
- if (!positions.isEmpty()) {
- blockPos = positions.pop();
- return true;
- }
-
- blockPos = null;
- return false;
- }
-
- //PERFORMANCE HEAVY DO NOT USE FREQUENTLY
- private boolean canSeeBlock(Level level, Vec3 start, BlockPos target) {
- Vec3 targetCenter = target.getCenter();
- ClipContext ctx = new ClipContext(start, targetCenter, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, builderEntity);
- BlockPos ctxPos = level.clip(ctx).getBlockPos();
- return ctxPos.equals(target);
- }
-
- @Override
- public boolean canContinueToUse() {
- return canUse();
- }
-
- @Override
- public boolean isInterruptable() {
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick() {
- return true;
- }
-
- public static List<BuildArea> getAvailableWorkAreasByPriority(ServerLevel level, BuilderEntity builderEntity, @Nullable BuildArea currentArea) {
- List<BuildArea> list = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(builderEntity, 64, BuildArea.class);
-
- Map<BuildArea, Integer> priorityMap = new HashMap<>();
-
- for (BuildArea area : list) {
- if (area == null || area == currentArea || !area.canWorkHere(builderEntity)) continue;
-
- if(!area.hasPendingBuildWork()) continue;
-
- int priority = 0;
-
- boolean perfectCandidate = true;//area.isWorkerPerfectCandidate(builderEntity);
-
- if (perfectCandidate) {
- priority += 10;
- } else {
- priority += 1;
- }
-
- if (!area.isBeingWorkedOn()) {
- priority += 3;
- }
-
- priority += area.time;
- priority += WorkerBindingResume.priorityBoost(builderEntity.getBoundWorkAreaUUID(), area.getUUID());
-
- //double dist = area.position().distanceToSqr(builderEntity.position());
- //priority -= dist / 10.0;
-
- priorityMap.put(area, priority);
- }
-
-
- List<BuildArea> sorted = new ArrayList<>(priorityMap.keySet());
- sorted.sort((a, b) -> Integer.compare(priorityMap.get(b), priorityMap.get(a)));
-
- return sorted;
- }
-
-
-
- public boolean moveToPosition(BlockPos pos, int threshold){
- if(pos == null){
- return false;
- }
- else{
- double distance = builderEntity.getHorizontalDistanceTo(pos.getCenter());
- if(distance < threshold){
- builderEntity.getNavigation().stop();
- lastPathRequestPos = null;
- return false;
- }
- else{
-
- builderEntity.setFollowState(6); //Working
- if(shouldRequestPath(pos)){
- builderEntity.getNavigation().moveTo(pos.getX(), pos.getY(), pos.getZ(), 0.8F);
- }
- builderEntity.getLookControl().setLookAt(pos.getCenter());
- }
- return true;
- }
- }
-
- private boolean shouldRequestPath(BlockPos pos) {
- if(!pos.equals(lastPathRequestPos) || builderEntity.tickCount - lastPathRequestTick >= PATH_REQUEST_COOLDOWN_TICKS){
- lastPathRequestPos = pos;
- lastPathRequestTick = builderEntity.tickCount;
- return true;
- }
- return false;
- }
-
- public enum State{
- SELECT_WORK_AREA,
- MOVE_TO_WORK_AREA,
- PREPARE_BREAK_BLOCKS,
- BREAK_BLOCKS,
- PREPARE_PLACE_BLOCKS,
- PLACE_BLOCKS,
- PREPARE_PLACE_MULTIBLOCK,
- PLACE_MULTIBLOCK,
- DONE,
- ERROR
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/FarmerWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/FarmerWorkGoal.java
deleted file mode 100644
index 3d1f98ae..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/FarmerWorkGoal.java
+++ /dev/null
@@ -1,498 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
-import com.talhanation.bannermod.entity.civilian.FarmerEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.workarea.CropArea;
-import com.talhanation.bannermod.persistence.civilian.NeededItem;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.item.*;
-import net.minecraft.world.level.block.*;
-import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.common.SpecialPlantable;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-public class FarmerWorkGoal extends Goal {
-
- private static final int PATH_REQUEST_COOLDOWN_TICKS = 20;
-
- public FarmerEntity farmer;
- public State state;
- public String errorMessage;
- public boolean errorMessageDone;
- public BlockPos blockPos;
- public Stack<BlockPos> stackToPlant;
- public Stack<BlockPos> stackToBreak;
- public Stack<BlockPos> stackToPlow;
- public List<NeededItem> neededItems = new ArrayList<>();
- private int lastPathRequestTick = -PATH_REQUEST_COOLDOWN_TICKS;
- @Nullable
- private BlockPos lastPathRequestPos;
- public FarmerWorkGoal(FarmerEntity farmer) {
- this.farmer = farmer;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
-
- @Override
- public boolean canUse() {
- return !farmer.needsToSleep() && farmer.shouldWork() && !farmer.needsToGetToChest() && this.isCropAreaNotRemoved();
- }
-
- private boolean isCropAreaNotRemoved() {
- CropArea area = farmer.getCurrentCropArea();
- if(area == null || !area.isRemoved()) return true;
- else {
- farmer.setCurrentWorkArea(null);
- }
- return false;
- }
-
- @Override
- public void start() {
- super.start();
-
- setState(State.SELECT_WORK_AREA);
- }
- boolean workDone;
- int cooldown;
- @Override
- public void tick() {
- super.tick();
- if(this.farmer.getCommandSenderWorld().isClientSide()) return;
-
- if(state == null) return;
- if(blockPos != null) this.farmer.getLookControl().setLookAt(blockPos.getCenter());
- if(farmer.tickCount % 5 != 0) return;
-
- if(!isCropAreaNotRemoved()) return;
-
- if(state != State.SELECT_WORK_AREA && this.farmer.getCurrentCropArea() == null){
- setState(State.SELECT_WORK_AREA);
- return;
- }
-
- if(blockPos != null && moveToPosition(blockPos, 20)) return;
-
- switch(state){
- case SELECT_WORK_AREA -> {
- if(this.farmer.getCurrentCropArea() != null) {
- setState(State.MOVE_TO_WORK_AREA);
- return;
- }
-
- if(!FarmerAreaSelectionTiming.shouldSearchForArea(false, ++cooldown)) return;
- this.cooldown = 0;
-
- List<CropArea> areas = getAvailableWorkAreasByPriority((ServerLevel) farmer.getCommandSenderWorld(), farmer, this.farmer.getCurrentCropArea());
-
- if (!areas.isEmpty()) {
- this.farmer.setCurrentWorkArea(areas.get(0));
- }
-
- if(this.farmer.getCurrentCropArea() == null) {
- farmer.reportIdleReason("farmer_no_area", Component.literal(farmer.getName().getString() + ": Waiting for a crop area."));
- return;
- }
-
- farmer.clearWorkStatus();
- this.farmer.getCurrentCropArea().setBeingWorkedOn(true);
- this.farmer.getCurrentCropArea().setTime(0);
- this.workDone = false;
- setState(State.MOVE_TO_WORK_AREA);
- }
-
- case MOVE_TO_WORK_AREA ->{
- this.blockPos = null;
- if(this.moveToPosition(this.farmer.getCurrentCropArea().getOnPos(), 20)) return;
- setState(State.PREPARE_BREAK_BLOCKS);
- }
- case PREPARE_BREAK_BLOCKS -> {
- this.farmer.getCurrentCropArea().scanBreakArea();
-
- this.stackToBreak = this.farmer.getCurrentCropArea().stackToBreak;
-
- if(stackToBreak.isEmpty()){
- setState(State.PREPARE_PLOWING);
- return;
- }
-
- farmer.switchMainHandItem(itemStack -> itemStack.getItem().getDefaultInstance().isEmpty());
-
- setState(State.BREAK_BLOCKS);
- }
- case BREAK_BLOCKS -> {
- if(this.breakBlocks(this.stackToBreak)) return;
-
- setState(State.PREPARE_WATER_SPOT);
- }
- case PREPARE_WATER_SPOT -> {
- BlockState centerPosState = farmer.getCommandSenderWorld().getBlockState(this.farmer.getCurrentCropArea().getWaterPosCenter());
- if(centerPosState.isAir()){
-
- ItemStack itemStack = farmer.getMatchingItem(item -> farmer.isBucketWithWater(item));
- if(itemStack == null){
- farmer.requestRequiredItem(new NeededItem(item -> farmer.isBucketWithWater(item), 1, true),
- "farmer_missing_water_bucket",
- Component.literal(farmer.getName().getString() + ": I need a water bucket to prepare this field."));
- return;
- }
- else if(itemStack.getItem() instanceof BucketItem bucketItem){
- farmer.switchMainHandItem(item -> farmer.isBucketWithWater(item));
-
- bucketItem.emptyContents(null, farmer.getCommandSenderWorld(), this.farmer.getCurrentCropArea().getWaterPosCenter(), null);
- }
- }
-
- setState(State.PREPARE_PLOWING);
- }
-
- case PREPARE_PLOWING -> {
- this.farmer.getCurrentCropArea().scanPlowArea();
-
- this.stackToPlow = this.farmer.getCurrentCropArea().stackToPlow;
- if(stackToPlow.isEmpty()){
- applyLoopDecision(FarmerLoopProgress.selectNextAction(false, false, true));
- return;
- }
-
- farmer.switchMainHandItem(itemStack -> itemStack.getItem() instanceof HoeItem);
-
- boolean hasHoe = farmer.getMainHandItem().getItem() instanceof HoeItem;
- if(!hasHoe){
- farmer.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof HoeItem, 1, true),
- "farmer_missing_hoe",
- Component.literal(farmer.getName().getString() + ": I need a hoe to keep working."));
- this.blockPos = null;
- applyLoopDecision(FarmerLoopProgress.waitForRequiredItem(FarmerLoopProgress.Action.PREPARE_PLOWING));
- return;
- }
-
- setState(State.PLOWING);
- }
- case PLOWING -> {
- if(this.plowBlocks(stackToPlow)) return;
-
- setState(State.PREPARE_PLANT_SEEDS);
- }
-
- case PREPARE_PLANT_SEEDS -> {
- this.farmer.getCurrentCropArea().scanPlantArea();
-
- this.stackToPlant = this.farmer.getCurrentCropArea().stackToPlant;
- if(stackToPlant.isEmpty()){
- applyLoopDecision(FarmerLoopProgress.selectNextAction(false, false, false));
- return;
- }
-
- ItemStack seedTemplate = FarmerPlantingPreparation.resolveSeedTemplate(this.farmer.getCurrentCropArea().getSeedStack(), this.farmer.getInventory());
- if(!seedTemplate.isEmpty() && this.farmer.getCurrentCropArea().getSeedStack().isEmpty()){
- this.farmer.getCurrentCropArea().setSeedStack(seedTemplate);
- this.farmer.getCurrentCropArea().updateType();
- }
-
- if(this.farmer.getCurrentCropArea().getSeedStack().isEmpty()){
- farmer.requestRequiredItem(new NeededItem(FarmerPlantingPreparation::isSupportedSeed, stackToPlant.size(), true),
- "farmer_missing_seeds",
- Component.literal(farmer.getName().getString() + ": I need seeds for this field."));
- this.blockPos = null;
- applyLoopDecision(FarmerLoopProgress.waitForRequiredItem(FarmerLoopProgress.Action.PREPARE_PLANT_SEEDS));
- return;
- }
-
- ItemStack seedFromInv = farmer.getMatchingItem(itemStack -> ItemStack.isSameItemSameComponents(itemStack, this.farmer.getCurrentCropArea().getSeedStack()));
- if(seedFromInv == null){
- ItemStack seedStack = this.farmer.getCurrentCropArea().getSeedStack();
- farmer.requestRequiredItem(new NeededItem(itemStack -> ItemStack.isSameItemSameComponents(itemStack, seedStack), stackToPlant.size(), true),
- "farmer_missing_seeds",
- Component.literal(farmer.getName().getString() + ": I need more seeds for this field."));
- this.blockPos = null;
- applyLoopDecision(FarmerLoopProgress.waitForRequiredItem(FarmerLoopProgress.Action.PREPARE_PLANT_SEEDS));
- return;
- }
-
- farmer.clearWorkStatus();
- this.farmer.switchMainHandItem(itemStack -> itemStack.is(this.farmer.getCurrentCropArea().getSeedStack().getItem()));
-
- setState(State.PLANT_SEEDS);
- }
-
- case PLANT_SEEDS -> {
- if(this.plantSeeds(stackToPlant)) return;
-
- setState(State.DONE);
- }
-
- case DONE -> {
- if(!workDone){
- workDone = true;
- setState(State.SELECT_WORK_AREA);
-
- this.farmer.getCurrentCropArea().setBeingWorkedOn(false);
- blockPos = null;
- this.farmer.setCurrentWorkArea(null);
- this.cooldown = FarmerAreaSelectionTiming.cooldownAfterWorkCycle();
-
- if(!this.neededItems.isEmpty()){
- for(NeededItem neededItem : neededItems){
- this.farmer.addNeededItem(neededItem);
- }
- this.neededItems.clear();
- }
- else {
- farmer.clearWorkStatus();
- }
- }
- }
-
- case ERROR ->{
- if(!errorMessageDone){
- errorMessageDone = true;
- }
- }
- }
- }
-
- public void setState(State state) {
- //if(farmer.getOwner() != null) farmer.getOwner().sendSystemMessage(Component.literal(state.toString()));
- this.state = state;
- }
-
- private void applyLoopDecision(FarmerLoopProgress.Decision decision) {
- if (decision == null) {
- return;
- }
-
- switch (decision.action()) {
- case PREPARE_BREAK_BLOCKS -> setState(State.PREPARE_BREAK_BLOCKS);
- case PREPARE_PLOWING -> setState(State.PREPARE_PLOWING);
- case PREPARE_PLANT_SEEDS -> setState(State.PREPARE_PLANT_SEEDS);
- case WAIT_FOR_ITEM -> setState(mapActionToState(decision.resumeAction()));
- case FINISHED -> setState(State.DONE);
- }
- }
-
- private State mapActionToState(FarmerLoopProgress.Action action) {
- return switch (action) {
- case PREPARE_BREAK_BLOCKS -> State.PREPARE_BREAK_BLOCKS;
- case PREPARE_PLOWING -> State.PREPARE_PLOWING;
- case PREPARE_PLANT_SEEDS -> State.PREPARE_PLANT_SEEDS;
- case WAIT_FOR_ITEM, FINISHED -> state;
- };
- }
-
- @Override
- public boolean canContinueToUse() {
- return canUse();
- }
-
- @Override
- public boolean isInterruptable() {
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick() {
- return true;
- }
-
- public boolean plantSeeds(Stack<BlockPos> positions){
- if(positions != null){
- ItemStack seedFromInv = farmer.getMatchingItem(itemStack -> itemStack.is(this.farmer.getCurrentCropArea().getSeedStack().getItem()));
- if(seedFromInv == null){
- seedFromInv = farmer.getMatchingItem(itemStack -> ItemStack.isSameItemSameComponents(itemStack, this.farmer.getCurrentCropArea().getSeedStack()));
- }
- if(seedFromInv == null){
- setState(State.PREPARE_PLANT_SEEDS);
- return false;
- }
-
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- BlockState state = farmer.getCommandSenderWorld().getBlockState(blockPos);
- if(state.getBlock() instanceof CropBlock || state.getBlock() instanceof StemBlock){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- }
- else if (seedFromInv.getItem() instanceof BlockItem blockItem) {
- farmer.getCommandSenderWorld().setBlockAndUpdate(blockPos, blockItem.getBlock().defaultBlockState());
-
- farmer.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), SoundEvents.CROP_PLANTED, SoundSource.BLOCKS, 1.0F, 1.0F);
- seedFromInv.shrink(1);
- this.farmer.swing(InteractionHand.MAIN_HAND);
- }
- else if (seedFromInv.getItem() instanceof SpecialPlantable plantable) {
- if (plantable.canPlacePlantAtPosition(seedFromInv, farmer.getCommandSenderWorld(), blockPos, Direction.UP)) {
- plantable.spawnPlantAtPosition(seedFromInv, farmer.getCommandSenderWorld(), blockPos, Direction.UP);
-
- farmer.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), SoundEvents.CROP_PLANTED, SoundSource.BLOCKS, 1.0F, 1.0F);
- seedFromInv.shrink(1);
- this.farmer.swing(InteractionHand.MAIN_HAND);
- }
- }
- return true;
- }
- this.blockPos = null;
- return false;
- }
-
- public boolean plowBlocks(Stack<BlockPos> positions){
- if(positions != null){
- boolean hasTool = farmer.getMainHandItem().getItem() instanceof HoeItem;
- if(!hasTool){
- setState(State.PREPARE_PLOWING);
- return true;
- }
-
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- BlockState state = farmer.getCommandSenderWorld().getBlockState(blockPos);
- if(state.getBlock() instanceof FarmBlock){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- }
- else{
- this.farmer.swing(InteractionHand.MAIN_HAND);
- farmer.getCommandSenderWorld().setBlock(blockPos, Blocks.FARMLAND.defaultBlockState(), 3);
- farmer.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), SoundEvents.HOE_TILL, SoundSource.BLOCKS, 1.0F, 1.0F);
- this.farmer.damageMainHandItem();
- }
- return true;
- }
- return false;
- }
- int blockBreakTime;
- public boolean breakBlocks(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- if(AbstractWorkerEntity.isPosBroken(blockPos, this.farmer.getCommandSenderWorld(), true)){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- blockBreakTime = 0;
-
- }
- else{
- this.farmer.mineBlock(blockPos);
- this.farmer.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- return false;
- }
-
- public static List<CropArea> getAvailableWorkAreasByPriority(ServerLevel level, FarmerEntity farmer, @Nullable CropArea currentArea) {
- List<CropArea> list = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(farmer, 64, CropArea.class);
-
- Map<CropArea, Integer> priorityMap = new HashMap<>();
-
- for (CropArea area : list) {
- if (area == null || area == currentArea || !area.canWorkHere(farmer)) continue;
-
- int priority = 0;
-
- boolean perfectCandidate = area.isWorkerPerfectCandidate(farmer);
-
- if (perfectCandidate) {
- priority += 10;
- } else {
- priority += 1;
- }
-
- if (!area.isBeingWorkedOn()) {
- priority += 10;
- }
-
- priority += area.getTime() * 10;
- priority += WorkerBindingResume.priorityBoost(farmer.getBoundWorkAreaUUID(), area.getUUID());
-
- priorityMap.put(area, priority);
- }
-
- List<CropArea> sorted = new ArrayList<>(priorityMap.keySet());
- sorted.sort((a, b) -> Integer.compare(priorityMap.get(b), priorityMap.get(a)));
-
- return sorted;
- }
-
-
-
- public boolean moveToPosition(BlockPos pos, int threshold){
- if(pos == null){
- return false;
- }
- else{
- double distance = farmer.getHorizontalDistanceTo(pos.getCenter());
- if(distance < threshold){
- farmer.getNavigation().stop();
- lastPathRequestPos = null;
- return false;
- }
- else{
- if(shouldRequestPath(pos) || farmer.getNavigation().isDone()){
- farmer.getNavigation().moveTo(pos.getX() + 0.5D, pos.getY(), pos.getZ() + 0.5D, 0.8F);
- }
- farmer.setFollowState(6); //Working
- farmer.getLookControl().setLookAt(pos.getCenter());
- }
- return true;
- }
- }
-
- private boolean shouldRequestPath(BlockPos pos) {
- if(!pos.equals(lastPathRequestPos) || farmer.tickCount - lastPathRequestTick >= PATH_REQUEST_COOLDOWN_TICKS){
- lastPathRequestPos = pos;
- lastPathRequestTick = farmer.tickCount;
- return true;
- }
- return false;
- }
-
- public enum State{
- SELECT_WORK_AREA,
- MOVE_TO_WORK_AREA,
- PREPARE_BREAK_BLOCKS,
- BREAK_BLOCKS,
- PREPARE_WATER_SPOT,
- PREPARE_PLOWING,
- PLOWING,
- PREPARE_PLANT_SEEDS,
- PLANT_SEEDS,
- DONE,
- ERROR
-
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/FishermanWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/FishermanWorkGoal.java
deleted file mode 100644
index 4f9062d2..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/FishermanWorkGoal.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.talhanation.bannermod.entity.civilian.FishermanEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.FishingBobberEntity;
-import com.talhanation.bannermod.entity.civilian.workarea.FishingArea;
-import com.talhanation.bannermod.persistence.civilian.NeededItem;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.item.FishingRodItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.LootParams;
-import net.minecraft.world.level.storage.loot.LootTable;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
-import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
-import net.minecraft.world.phys.Vec3;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-public class FishermanWorkGoal extends Goal {
-
- private static final int PATH_REQUEST_COOLDOWN_TICKS = 20;
-
- public FishermanEntity fisherman;
- public FishingBobberEntity fishingBobber;
- public State state;
- public String errorMessage;
- public boolean errorMessageDone;
- public BlockPos blockPos;
- private int catchTime = 0;
- private int throwTime;
- private int lastPathRequestTick = -PATH_REQUEST_COOLDOWN_TICKS;
- @Nullable
- private BlockPos lastPathRequestPos;
- public FishermanWorkGoal(FishermanEntity fisherman) {
- this.fisherman = fisherman;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
-
- @Override
- public boolean canUse() {
- return !fisherman.needsToSleep() && fisherman.shouldWork() && !fisherman.needsToGetToChest() && this.isAreaNotRemoved();
- }
-
- private boolean isAreaNotRemoved() {
- FishingArea area = fisherman.getCurrentFishingArea();
- if(area == null || !area.isRemoved()) return true;
- else {
- fisherman.setCurrentWorkArea(null);
- }
- return false;
- }
-
- @Override
- public void start() {
- super.start();
- setState(State.SELECT_WORK_AREA);
- }
-
- @Override
- public void stop() {
- super.stop();
- if(fishingBobber != null && fishingBobber.isAlive()){
- this.fisherman.playSound(SoundEvents.FISHING_BOBBER_SPLASH, 1, 1);
- this.fishingBobber.discard();
- this.fishingBobber = null;
- }
- }
-
- int cooldown;
- @Override
- public void tick() {
- super.tick();
- if(this.fisherman.getCommandSenderWorld().isClientSide()) return;
- if(state == null) return;
- if(blockPos != null) this.fisherman.getLookControl().setLookAt(blockPos.getCenter());
- if(fisherman.tickCount % 5 != 0) return;
-
- if(!isAreaNotRemoved()) return;
-
- if(state != State.SELECT_WORK_AREA && this.fisherman.getCurrentFishingArea() == null){
- setState(State.SELECT_WORK_AREA);
- return;
- }
-
- switch(state){
- case SELECT_WORK_AREA -> {
- if(this.fisherman.getCurrentFishingArea() != null) setState(State.MOVE_TO_WORK_AREA);
-
- if(++cooldown < fisherman.getRandom().nextInt(300)) return;
- this.cooldown = 0;
-
- List<FishingArea> areas = getAvailableWorkAreasByPriority((ServerLevel) fisherman.getCommandSenderWorld(), fisherman, this.fisherman.getCurrentFishingArea());
-
- if (!areas.isEmpty()) {
- this.fisherman.setCurrentWorkArea(areas.get(0));
- }
-
- if(this.fisherman.getCurrentFishingArea() == null) {
- fisherman.reportIdleReason("fisherman_no_area", Component.literal(fisherman.getName().getString() + ": Waiting for a fishing area."));
- return;
- }
-
- fisherman.clearWorkStatus();
- this.fisherman.getCurrentFishingArea().setBeingWorkedOn(true);
- this.fisherman.getCurrentFishingArea().setTime(0);
-
- setState(State.MOVE_TO_WORK_AREA);
- }
-
- case MOVE_TO_WORK_AREA -> {
- this.blockPos = null;
- if(this.moveToPosition(this.fisherman.getCurrentFishingArea().getOnPos(), 20)) return;
-
- setState(State.PREPARE_FISHING);
- }
-
- case PREPARE_FISHING -> {
- if(++cooldown < 20) return;
- this.cooldown = 0;
-
- if(!fisherman.hasFreeInvSlot()){
- fisherman.reportBlockedReason("fisherman_inventory_full", Component.literal(fisherman.getName().getString() + ": My inventory is full."));
- fisherman.forcedDeposit = true;
- return;
- }
-
- boolean hasFishingRod = fisherman.getInventory().hasAnyMatching(itemStack -> itemStack.getItem() instanceof FishingRodItem);
- if(!hasFishingRod){
- fisherman.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof FishingRodItem, 1, true),
- "fisherman_missing_rod",
- Component.literal(fisherman.getName().getString() + ": I need a fishing rod to continue."));
- return;
- }
- else {
- fisherman.clearWorkStatus();
- fisherman.switchMainHandItem(itemStack -> itemStack.getItem() instanceof FishingRodItem);
- }
-
- this.fisherman.swing(InteractionHand.MAIN_HAND);
- this.fisherman.playSound(SoundEvents.FISHING_BOBBER_THROW, 1, 1);
-
- Vec3 center = fisherman.getCurrentFishingArea().getArea().getCenter();
-
- this.fishingBobber = fisherman.throwFishingHook(center);
-
- blockPos = BlockPos.containing(center);
-
- catchTime = 130;
-
- setState(State.FISHING);
- }
-
- case FISHING -> {
- if(fishingBobber != null){
- if(fishingBobber.hooked){
- setState(State.CATCH);
- return;
- }
- else if(fishingBobber.onGround()){
- this.fisherman.swing(InteractionHand.MAIN_HAND);
- this.fisherman.playSound(SoundEvents.FISHING_BOBBER_RETRIEVE, 1, 1);
- this.fishingBobber.discard();
- this.fishingBobber = null;
-
- setState(State.MOVE_TO_WORK_AREA);
- return;
- }
- }
-
- if(++throwTime > catchTime){
- throwTime = 0;
- this.fisherman.playSound(SoundEvents.FISHING_BOBBER_SPLASH, 1, 1);
- setState(State.CATCH);
- }
- }
-
- case CATCH -> {
- this.fisherman.swing(InteractionHand.MAIN_HAND);
- this.fisherman.playSound(SoundEvents.FISHING_BOBBER_RETRIEVE, 1, 1);
-
- this.spawnFishingLoot();
-
- if(this.fishingBobber != null){
- this.fishingBobber.discard();
- this.fishingBobber = null;
- }
- this.fisherman.farmedItems++;
- if(this.fisherman.tickCount % 2 == 0) this.fisherman.damageMainHandItem();
-
- setState(State.PREPARE_FISHING);
- }
-
- case DONE -> {
- this.fisherman.getCurrentFishingArea().setBeingWorkedOn(false);
- blockPos = null;
- this.fisherman.setCurrentWorkArea(null);
- fisherman.clearWorkStatus();
- }
-
- case ERROR -> {
- if(!errorMessageDone){
- errorMessageDone = true;
- }
- }
- }
- }
-
- public void setState(State state) {
- //if(fisherman.getOwner() != null) fisherman.getOwner().sendSystemMessage(Component.literal(state.toString()));
- this.state = state;
- }
-
- @Override
- public boolean canContinueToUse() {
- return canUse();
- }
-
- @Override
- public boolean isInterruptable() {
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick() {
- return true;
- }
-
- public static List<FishingArea> getAvailableWorkAreasByPriority(ServerLevel level, FishermanEntity fisherman, @Nullable FishingArea currentArea) {
- List<FishingArea> list = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(fisherman, 64, FishingArea.class);
-
- WorkerBindingResume.prioritizeBoundFirst(list, fisherman.getBoundWorkAreaUUID(), FishingArea::getUUID);
-
-
- return list;
- }
-
- public boolean moveToPosition(BlockPos pos, int threshold){
- if(pos == null){
- return false;
- }
- else{
- double distance = fisherman.getHorizontalDistanceTo(pos.getCenter());
- if(distance < threshold){
- fisherman.getNavigation().stop();
- lastPathRequestPos = null;
- return false;
- }
- else{
- if(shouldRequestPath(pos)){
- fisherman.getNavigation().moveTo(pos.getX(), pos.getY(), pos.getZ(), 0.8F);
- }
- fisherman.setFollowState(6); //Working
- fisherman.getLookControl().setLookAt(pos.getCenter());
- }
- return true;
- }
- }
-
- private boolean shouldRequestPath(BlockPos pos) {
- if(!pos.equals(lastPathRequestPos) || fisherman.tickCount - lastPathRequestTick >= PATH_REQUEST_COOLDOWN_TICKS){
- lastPathRequestPos = pos;
- lastPathRequestTick = fisherman.tickCount;
- return true;
- }
- return false;
- }
-
- public void spawnFishingLoot() {
- if(fishingBobber == null ) return;
-
- ServerLevel serverLevel = (ServerLevel)this.fisherman.getCommandSenderWorld();
- double luckFromTool = EnchantmentHelper.getFishingLuckBonus(serverLevel, this.fisherman.getItemInHand(InteractionHand.MAIN_HAND), this.fisherman);
- double luckFromDepth = Math.min(25, fishingBobber.getWaterDepth())/10F;
- double luck = 0.1D + luckFromTool + luckFromDepth;
-
- LootParams lootparams = (new LootParams.Builder(serverLevel))
- .withParameter(LootContextParams.ORIGIN, this.fisherman.position())
- .withParameter(LootContextParams.TOOL, fisherman.getMainHandItem())
- .withParameter(LootContextParams.ATTACKING_ENTITY, this.fisherman)
- .withLuck((float)(luck + luckFromTool))
- .create(LootContextParamSets.FISHING);
- LootTable loottable = this.fisherman.getCommandSenderWorld().getServer().reloadableRegistries().getLootTable(BuiltInLootTables.FISHING);
- List<ItemStack> list = loottable.getRandomItems(lootparams);
-
- MinecraftServer server = fisherman.getServer();
- if (server == null) return;
-
- for (ItemStack itemstack : list) {
- fisherman.getInventory().addItem(itemstack);
- }
- }
-
- public enum State{
- SELECT_WORK_AREA,
- MOVE_TO_WORK_AREA,
- PREPARE_FISHING,
- FISHING,
- CATCH,
- DONE,
- ERROR
-
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/LumberjackWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/LumberjackWorkGoal.java
deleted file mode 100644
index f26a924a..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/LumberjackWorkGoal.java
+++ /dev/null
@@ -1,499 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.talhanation.bannermod.entity.civilian.LumberjackEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.workarea.LumberArea;
-import com.talhanation.bannermod.persistence.civilian.NeededItem;
-import com.talhanation.bannermod.persistence.civilian.Tree;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.item.AxeItem;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.ShearsItem;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.SaplingBlock;
-import net.minecraft.world.level.block.state.BlockState;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-public class LumberjackWorkGoal extends Goal {
-
- private static final int AREA_SEARCH_COOLDOWN_TICKS = 20;
- private static final int PATH_REQUEST_COOLDOWN_TICKS = 20;
-
- public LumberjackEntity lumberjack;
- public State state;
- public String errorMessage;
- public boolean errorMessageDone;
- public BlockPos blockPos;
- public Stack<Tree> stackOfTrees;
- public Stack<BlockPos> stackToPlant;
- public Tree currentTree;
- private int lastAreaSearchTick = -AREA_SEARCH_COOLDOWN_TICKS;
- private int lastPathRequestTick = -PATH_REQUEST_COOLDOWN_TICKS;
- @Nullable
- private BlockPos lastPathRequestPos;
-
- public LumberjackWorkGoal(LumberjackEntity lumberjack) {
- this.lumberjack = lumberjack;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
-
- @Override
- public boolean canUse() {
- return !lumberjack.needsToSleep() && lumberjack.shouldWork() && !lumberjack.needsToGetToChest();
- }
-
- @Override
- public void start() {
- super.start();
- if(this.lumberjack.getCommandSenderWorld().isClientSide()) return;
-
-
- setState(State.SELECT_WORK_AREA);
- }
- boolean workDone;
- @Override
- public void tick() {
- super.tick();
- if(this.lumberjack.getCommandSenderWorld().isClientSide()) return;
- if(state == null) return;
- if(blockPos != null) this.lumberjack.getLookControl().setLookAt(blockPos.getCenter());
-
- if(state == State.WOOD_CUTTING){
- if(this.breakBlocks(currentTree.getStackToBreak())) return;
-
- currentTree.setInWork(false);
- setState(State.SELECT_TREE);
- }
-
- if(lumberjack.tickCount % 10 != 0) return;
-
- switch(state){
- case SELECT_WORK_AREA ->{
- if(lumberjack.getCurrentLumberArea() != null) setState(State.MOVE_TO_WORK_AREA);
-
- if(lumberjack.tickCount - lastAreaSearchTick < AREA_SEARCH_COOLDOWN_TICKS) return;
- lastAreaSearchTick = lumberjack.tickCount;
-
- List<LumberArea> areas = getAvailableWorkAreasByPriority((ServerLevel) lumberjack.getCommandSenderWorld(), lumberjack, lumberjack.getCurrentLumberArea());
-
- if (!areas.isEmpty()) {
- lumberjack.setCurrentWorkArea(areas.get(0));
- }
-
- if(lumberjack.getCurrentLumberArea() == null) {
- lumberjack.reportIdleReason("lumberjack_no_area", Component.literal(lumberjack.getName().getString() + ": Waiting for a lumber area."));
- return;
- }
-
- lumberjack.clearWorkStatus();
- lumberjack.getCurrentLumberArea().setBeingWorkedOn(true);
- this.lumberjack.getCurrentLumberArea().setTime(0);
- workDone = false;
- setState(State.MOVE_TO_WORK_AREA);
- }
-
- case MOVE_TO_WORK_AREA ->{
- this.blockPos = null;
- if(this.moveToPosition(lumberjack.getCurrentLumberArea().getOnPos(), 100)) return;
-
- setState(State.SCAN_TREES);
- }
-
- case SCAN_TREES ->{
- if(lumberjack.getCurrentLumberArea().stackOfTrees.isEmpty()){
- lumberjack.getCurrentLumberArea().scanForTrees();
- }
-
- this.stackOfTrees = lumberjack.getCurrentLumberArea().stackOfTrees;
- this.stackOfTrees.sort(Comparator.comparing(tree -> tree.getPosition().getCenter().distanceToSqr(lumberjack.position())));
-
- if(stackOfTrees.isEmpty()){
-
- setState(State.PREPARE_PLANT_SAPLINGS);
- return;
- }
-
- setState(State.SELECT_TREE);
- }
-
- case SELECT_TREE -> {
- if(stackOfTrees.isEmpty()){
- setState(State.SCAN_TREES);
- return;
- }
-
- this.currentTree = this.stackOfTrees.pop();
- this.currentTree.setInWork(true);
- setState(State.MOVE_TO_TREE);
- }
-
- case MOVE_TO_TREE -> {
- if(this.moveToPosition(currentTree.getPosition(), 30)) return;
-
- setState(State.PREPARE_SHEAR_LEAVES);
- }
- case PREPARE_SHEAR_LEAVES -> {
- if(!lumberjack.getCurrentLumberArea().getShearLeaves()){
- setState(State.PREPARE_STRIP_LOGS);
- return;
- }
- lumberjack.switchMainHandItem(itemStack -> itemStack.getItem() instanceof ShearsItem);
-
- boolean hasShears = lumberjack.getMainHandItem().getItem() instanceof ShearsItem;
- if(!hasShears){
- lumberjack.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof ShearsItem, 1, true),
- "lumberjack_missing_shears",
- Component.literal(lumberjack.getName().getString() + ": I need shears to trim leaves."));
- this.blockPos = null;
- return;
- }
-
- setState(State.SHEAR_LEAVES);
- }
- case SHEAR_LEAVES -> {
- if(lumberjack.getCurrentLumberArea().getShearLeaves() && this.shearLeaves(currentTree.getStackToShear())) return;
-
- setState(State.PREPARE_STRIP_LOGS);
- }
- case PREPARE_STRIP_LOGS -> {
- if(!lumberjack.getCurrentLumberArea().getStripLogs()){
- setState(State.PREPARE_WOOD_CUTTING);
- return;
- }
-
- lumberjack.switchMainHandItem(itemStack -> itemStack.getItem() instanceof AxeItem);
-
- boolean hasAxe = lumberjack.getMainHandItem().getItem() instanceof AxeItem;
- if(!hasAxe){
- lumberjack.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof AxeItem, 1, true),
- "lumberjack_missing_axe",
- Component.literal(lumberjack.getName().getString() + ": I need an axe to continue."));
- this.blockPos = null;
- return;
- }
-
- setState(State.STRIP_WOOD);
- }
- case STRIP_WOOD -> {
- if(lumberjack.getCurrentLumberArea().getStripLogs() && this.stripLogs(currentTree.getStackToStrip())) return;
-
- setState(State.PREPARE_WOOD_CUTTING);
- }
- case PREPARE_WOOD_CUTTING -> {
- lumberjack.switchMainHandItem(itemStack -> itemStack.getItem() instanceof AxeItem);
-
- boolean hasAxe = lumberjack.getMainHandItem().getItem() instanceof AxeItem;
- if(!hasAxe){
- lumberjack.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof AxeItem, 1, true),
- "lumberjack_missing_axe",
- Component.literal(lumberjack.getName().getString() + ": I need an axe to continue."));
- this.blockPos = null;
- return;
- }
-
- setState(State.WOOD_CUTTING);
- }
- case WOOD_CUTTING -> {
-
- }
-
- case PREPARE_PLANT_SAPLINGS -> {
- if(!lumberjack.getCurrentLumberArea().getReplant()){
- setState(State.DONE);
- return;
- }
-
- this.lumberjack.getCurrentLumberArea().scanPlantArea();
- this.stackToPlant = lumberjack.getCurrentLumberArea().stackToPlant;
-
- if(stackToPlant.isEmpty()){
- setState(State.DONE);
- return;
- }
-
- setState(State.PLANT_SAPLINGS);
- }
-
- case PLANT_SAPLINGS -> {
- if(lumberjack.getCurrentLumberArea().getReplant() && this.plantSaplings(lumberjack.getCurrentLumberArea().getStackToPlant())) return;
-
- setState(State.DONE);
- }
-
- case DONE -> {
- if(!workDone){
- workDone = true;
- lumberjack.getCurrentLumberArea().setBeingWorkedOn(false);
- blockPos = null;
- lumberjack.setCurrentWorkArea(null);
- lumberjack.clearWorkStatus();
- this.start();
- }
- }
-
- case ERROR ->{
- if(!errorMessageDone){
- errorMessageDone = true;
- }
- }
- }
- }
-
- public void setState(State state) {
- //if(lumberjack.getOwner() != null) lumberjack.getOwner().sendSystemMessage(Component.literal(state.toString()));
- this.state = state;
- }
-
- int blockBreakTime;
- public boolean breakBlocks(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- BlockState state = lumberjack.getCommandSenderWorld().getBlockState(blockPos);
- if(state.isAir()){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- blockBreakTime = 0;
-
- }
- else{
- this.lumberjack.mineBlock(blockPos);
- this.lumberjack.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- return false;
- }
-
- public boolean stripLogs(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- BlockState state = lumberjack.getCommandSenderWorld().getBlockState(blockPos);
- if(AxeItem.STRIPPABLES.containsValue(state.getBlock())){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- }
- else{
- Block strippedBlock = AxeItem.STRIPPABLES.get(state.getBlock());
-
- if(strippedBlock == null){
- this.blockPos = null;
- return false;
- }
-
- this.lumberjack.getCommandSenderWorld().setBlock(blockPos, strippedBlock.defaultBlockState(), 3);
- this.lumberjack.getCommandSenderWorld().playSound(null, blockPos, SoundEvents.AXE_STRIP, SoundSource.BLOCKS, 1.0F, 1.0F);
-
- this.lumberjack.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- return false;
- }
-
- public boolean shearLeaves(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- BlockState state = lumberjack.getCommandSenderWorld().getBlockState(blockPos);
- if(state.isAir()){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- blockBreakTime = 0;
- }
- else{
- this.lumberjack.mineBlock(blockPos);
- this.lumberjack.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- return false;
- }
-
- public boolean plantSaplings(Stack<BlockPos> positions){
- if(positions != null){
- ItemStack saplingFromInv;
- if(lumberjack.getCurrentLumberArea().getSaplingStack().isEmpty()){
- saplingFromInv = lumberjack.getMatchingItem(itemStack -> itemStack.getItem() instanceof BlockItem blockItem && blockItem.getBlock() instanceof SaplingBlock);
- if(saplingFromInv == null){
- lumberjack.addNeededItem(new NeededItem(itemStack -> itemStack.getItem() instanceof BlockItem blockItem && blockItem.getBlock() instanceof SaplingBlock, 8, false));
- this.blockPos = null;
- return false;
- }
-
- }
- else{
- saplingFromInv = lumberjack.getMatchingItem(itemStack -> itemStack.is(lumberjack.getCurrentLumberArea().getSaplingStack().getItem()));
- if(saplingFromInv == null){
- lumberjack.addNeededItem(new NeededItem(itemStack -> ItemStack.isSameItemSameComponents(itemStack, lumberjack.getCurrentLumberArea().getSaplingStack()), 8, false));
- this.blockPos = null;
- return false;
- }
- }
-
- if(blockPos == null){
- if(!positions.isEmpty()) blockPos = positions.pop();
- return blockPos != null;
- }
-
- BlockState state = lumberjack.getCommandSenderWorld().getBlockState(blockPos);
- if(!state.isAir()){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- this.blockPos = null;
- return false;
- }
- }
- else if (saplingFromInv.getItem() instanceof BlockItem blockItem) {
- lumberjack.getCommandSenderWorld().setBlockAndUpdate(blockPos, blockItem.getBlock().defaultBlockState());
-
- lumberjack.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), SoundEvents.CROP_PLANTED, SoundSource.BLOCKS, 1.0F, 1.0F);
- saplingFromInv.shrink(1);
- this.lumberjack.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- this.blockPos = null;
- return false;
- }
- @Override
- public boolean canContinueToUse() {
- return canUse();
- }
-
- @Override
- public boolean isInterruptable() {
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick() {
- return true;
- }
-
- public static List<LumberArea> getAvailableWorkAreasByPriority(ServerLevel level, LumberjackEntity lumberjack, @Nullable LumberArea currentArea) {
- List<LumberArea> list = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(lumberjack, 64, LumberArea.class);
-
- Map<LumberArea, Integer> priorityMap = new HashMap<>();
-
- for (LumberArea area : list) {
- if (area == null || area == currentArea || !area.canWorkHere(lumberjack)) continue;
-
- int priority = 0;
-
- boolean perfectCandidate = area.isWorkerPerfectCandidate(lumberjack);
-
- if (perfectCandidate) {
- priority += 10;
- } else {
- priority += 1;
- }
-
- if (!area.isBeingWorkedOn()) {
- priority += 3;
- }
-
- priority += area.time;
- priority += WorkerBindingResume.priorityBoost(lumberjack.getBoundWorkAreaUUID(), area.getUUID());
-
- //double dist = area.position().distanceToSqr(lumberjack.position());
- //priority -= dist / 10.0;
-
- priorityMap.put(area, priority);
- }
-
- List<LumberArea> sorted = new ArrayList<>(priorityMap.keySet());
- sorted.sort((a, b) -> Integer.compare(priorityMap.get(b), priorityMap.get(a)));
-
- return sorted;
- }
-
-
-
- public boolean moveToPosition(BlockPos pos, int threshold){
- if(pos == null){
- return false;
- }
- else{
- double distance = lumberjack.getHorizontalDistanceTo(pos.getCenter());
- if(distance < threshold){
- lastPathRequestPos = null;
- return false;
- }
- else{
- if(shouldRequestPath(pos)){
- lumberjack.getNavigation().moveTo(pos.getX(), pos.getY(), pos.getZ(), 0.8F);
- }
- lumberjack.setFollowState(6); //Working
- lumberjack.getLookControl().setLookAt(pos.getCenter());
- }
- return true;
- }
- }
-
- private boolean shouldRequestPath(BlockPos pos) {
- if(!pos.equals(lastPathRequestPos) || lumberjack.tickCount - lastPathRequestTick >= PATH_REQUEST_COOLDOWN_TICKS){
- lastPathRequestPos = pos;
- lastPathRequestTick = lumberjack.tickCount;
- return true;
- }
- return false;
- }
-
- public enum State{
- SELECT_WORK_AREA,
- MOVE_TO_WORK_AREA,
- SCAN_TREES,
- SELECT_TREE,
- MOVE_TO_TREE,
- PREPARE_SHEAR_LEAVES,
- SHEAR_LEAVES,
- PREPARE_STRIP_LOGS,
- STRIP_WOOD,
- PREPARE_WOOD_CUTTING,
- WOOD_CUTTING,
- PREPARE_PLANT_SAPLINGS,
- PLANT_SAPLINGS,
- DONE,
- ERROR
-
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/MerchantWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/MerchantWorkGoal.java
deleted file mode 100644
index 493868bb..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/MerchantWorkGoal.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.talhanation.bannermod.entity.civilian.MerchantEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.workarea.MarketArea;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.phys.AABB;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-public class MerchantWorkGoal extends Goal {
-
- private final MerchantEntity merchant;
- private State state;
- private int cooldown;
-
- public MerchantWorkGoal(MerchantEntity merchant) {
- this.merchant = merchant;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
- @Override
- public boolean canUse() {
- if (merchant.isCreative()) return false;
- return merchant.shouldWork() && !merchant.needsToGetToChest();
- }
-
- @Override
- public boolean canContinueToUse() {
- return canUse();
- }
-
- @Override
- public boolean isInterruptable(){
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick(){
- return true;
- }
-
- @Override
- public void start() {
- setState(State.SELECT_WORK_AREA);
- }
-
- @Override
- public void stop() {
- MarketArea market = merchant.getCurrentMarketArea();
- if (market != null) {
- market.setBeingWorkedOn(false);
- merchant.setCurrentWorkArea(null);
- merchant.setCurrentMarketName("");
- }
- merchant.getNavigation().stop();
- }
-
- @Override
- public void tick() {
- if (merchant.getCommandSenderWorld().isClientSide()) return;
- if (state == null) return;
-
- if (state != State.SELECT_WORK_AREA && isCurrentAreaGone()) {
- leaveCurrentArea();
- setState(State.SELECT_WORK_AREA);
- return;
- }
-
- switch (state) {
- case SELECT_WORK_AREA -> {
- if (merchant.getCurrentMarketArea() != null) {
- setState(State.WALK_TO_CENTER);
- return;
- }
-
- if (++cooldown < merchant.getRandom().nextInt(200)) return;
- cooldown = 0;
-
- MarketArea found = findBestArea((ServerLevel) merchant.getCommandSenderWorld());
- if (found == null) {
- merchant.reportIdleReason("merchant_no_market", Component.literal(merchant.getName().getString() + ": Waiting for an open market area."));
- return;
- }
-
- merchant.setCurrentWorkArea(found);
- merchant.clearWorkStatus();
- found.setBeingWorkedOn(true);
- found.setTime(0);
-
- merchant.setCurrentMarketName(found.getMarketName());
- setState(State.WALK_TO_CENTER);
- }
-
- case WALK_TO_CENTER -> {
- if (moveToPosition(BlockPos.containing(merchant.getCurrentMarketArea().getArea().getCenter()), 3)) return;
- merchant.getNavigation().stop();
- setState(State.WORKING);
- }
-
- case WORKING -> {
- if (!merchant.getCurrentMarketArea().isOpen()) {
- merchant.reportIdleReason("merchant_market_closed", Component.literal(merchant.getName().getString() + ": My market is currently closed."));
- leaveCurrentArea();
- setState(State.SELECT_WORK_AREA);
- return;
- }
-
- merchant.clearWorkStatus();
- merchant.getNavigation().stop();
- merchant.setFollowState(6);
-
- Player nearby = merchant.getCommandSenderWorld()
- .getNearestPlayer(merchant, 8);
- if (nearby != null) {
- merchant.getLookControl().setLookAt(nearby, 30, 30);
- }
- else {
- merchant.setYRot(merchant.getCurrentMarketArea().getFacing().getOpposite().toYRot());
- }
-
- merchant.setCurrentMarketName(merchant.getCurrentMarketArea().getMarketName());
- }
- }
- }
-
- private void leaveCurrentArea() {
- MarketArea market = merchant.getCurrentMarketArea();
- if (market != null) {
- market.setBeingWorkedOn(false);
- merchant.setCurrentWorkArea(null);
- merchant.setCurrentMarketName("");
- }
- }
-
- private boolean isCurrentAreaGone() {
- MarketArea market = merchant.getCurrentMarketArea();
- return market == null || market.isRemoved();
- }
-
-
- private boolean moveToPosition(BlockPos pos, int thresholdBlocks) {
- double dist = merchant.getHorizontalDistanceTo(pos.getCenter());
- if (dist < thresholdBlocks) {
- merchant.getNavigation().stop();
- return false;
- }
- merchant.getNavigation().moveTo(pos.getX(), pos.getY(), pos.getZ(), 0.8F);
- merchant.setFollowState(6);
- merchant.getLookControl().setLookAt(pos.getCenter());
- return true;
- }
-
- @Nullable
- private MarketArea findBestArea(ServerLevel level) {
- List<MarketArea> areas = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(merchant, 64, MarketArea.class);
-
- WorkerBindingResume.prioritizeBoundFirst(areas, merchant.getBoundWorkAreaUUID(), MarketArea::getUUID);
-
- MarketArea best = null;
- int bestScore = -1;
-
- for (MarketArea area : areas) {
- if (area == null) continue;
- if (!area.canWorkHere(merchant)) continue;
- if (area.isBeingWorkedOn()) continue;
- int score = 0;
- score += area.getTime() * 10;
- score += WorkerBindingResume.priorityBoost(merchant.getBoundWorkAreaUUID(), area.getUUID());
-
- if (score > bestScore) {
- bestScore = score;
- best = area;
- }
- }
- return best;
- }
-
- private void setState(State s) {
- this.state = s;
- }
-
- public enum State {
- SELECT_WORK_AREA,
- WALK_TO_CENTER,
- WORKING
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/MinerWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/MinerWorkGoal.java
deleted file mode 100644
index 182c51af..00000000
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/MinerWorkGoal.java
+++ /dev/null
@@ -1,525 +0,0 @@
-package com.talhanation.bannermod.ai.civilian;
-
-import com.google.common.collect.ImmutableSet;
-import com.talhanation.bannermod.entity.civilian.MinerEntity;
-import com.talhanation.bannermod.entity.civilian.WorkerBindingResume;
-import com.talhanation.bannermod.entity.civilian.workarea.MiningArea;
-import com.talhanation.bannermod.persistence.civilian.NeededItem;
-import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.Component;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.ai.goal.Goal;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.PickaxeItem;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.Vec3;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-public class MinerWorkGoal extends Goal {
-
- private static final int AREA_SEARCH_COOLDOWN_TICKS = 20;
- private static final int PATH_REQUEST_COOLDOWN_TICKS = 20;
-
- public MinerEntity minerEntity;
- public State state;
- public String errorMessage;
- public boolean errorMessageDone;
- public BlockPos blockPos;
- public Stack<BlockPos> stackToBreak;
- public Stack<BlockPos> stackToPlace;
- private boolean needToSeeBlock;
- private int lastAreaSearchTick = -AREA_SEARCH_COOLDOWN_TICKS;
- private int lastPathRequestTick = -PATH_REQUEST_COOLDOWN_TICKS;
- @Nullable
- private BlockPos lastPathRequestPos;
-
- public MinerWorkGoal(MinerEntity minerEntity) {
- this.minerEntity = minerEntity;
- setFlags(EnumSet.of(Flag.LOOK, Flag.MOVE));
- }
-
- @Override
- public boolean canUse() {
- return !minerEntity.needsToSleep() && minerEntity.shouldWork() && !minerEntity.needsToGetToChest() && this.isMiningAreaAvailable();
- }
-
- @Override
- public void start() {
- super.start();
- if(this.minerEntity.getCommandSenderWorld().isClientSide()) return;
-
-
- setState(State.SELECT_WORK_AREA);
- }
- boolean workDone;
- @Override
- public void tick() {
- super.tick();
- if(this.minerEntity.getCommandSenderWorld().isClientSide()) return;
- if(state == null) return;
- if(blockPos != null) this.minerEntity.getLookControl().setLookAt(blockPos.getCenter());
-
- if(!isMiningAreaAvailable()) return;
-
- if(checkPlaceTorch()) return;
-
- if(state != State.SELECT_WORK_AREA && this.minerEntity.getCurrentMiningArea() == null){
- this.blockPos = null;
- setState(State.SELECT_WORK_AREA);
- return;
- }
-
- if(minerEntity.tickCount % 20 == 0){
- if(blockPos != null && moveToPosition(blockPos, 20)) return;
- }
-
- if(state == State.MINING){
- if(this.mineBlocks(this.stackToBreak)) return;
-
- setState(State.PREPARE_MINE_WALLS);
- }
-
- if(state == State.MINE_WALLS){
- if(this.mineBlocks(this.stackToBreak)) return;
-
- setState(State.CHECK);
- }
-
- if(minerEntity.tickCount % 5 != 0) return;
- switch(state){
- case SELECT_WORK_AREA ->{
- if(minerEntity.getCurrentMiningArea() != null) setState(State.MOVE_TO_WORK_AREA);
-
- if(minerEntity.tickCount - lastAreaSearchTick < AREA_SEARCH_COOLDOWN_TICKS) return;
- lastAreaSearchTick = minerEntity.tickCount;
-
- List<MiningArea> areas = getAvailableWorkAreasByPriority((ServerLevel) minerEntity.getCommandSenderWorld(), minerEntity, minerEntity.getCurrentMiningArea());
-
- if (!areas.isEmpty()) {
- minerEntity.setCurrentWorkArea(areas.get(0));
- }
-
- if(minerEntity.getCurrentMiningArea() == null) {
- minerEntity.reportIdleReason("miner_no_area", Component.literal(minerEntity.getName().getString() + ": Waiting for a mining area."));
- return;
- }
-
- minerEntity.clearWorkStatus();
- minerEntity.getCurrentMiningArea().setBeingWorkedOn(true);
- this.minerEntity.getCurrentMiningArea().setTime(0);
- this.minerEntity.getCurrentMiningArea().resetPatternProgress();
- workDone = false;
- setState(State.MOVE_TO_WORK_AREA);
- }
-
- case MOVE_TO_WORK_AREA ->{
- this.blockPos = null;
- if(this.moveToPosition(minerEntity.getCurrentMiningArea().getOnPos(), 70)) return;
-
- setState(State.PREPARE_CLOSE_FLOOR);
- }
-
- case PREPARE_MINING -> {
- this.blockPos = null;
-
- if(this.minerEntity.getCurrentMiningArea().stackToBreak.isEmpty()){
- this.minerEntity.getCurrentMiningArea().scanBreakArea();
- }
-
- this.stackToBreak = this.minerEntity.getCurrentMiningArea().stackToBreak;
-
- if(stackToBreak.isEmpty()){
- setState(State.PREPARE_MINE_WALLS);
- return;
- }
-
- minerEntity.switchMainHandItem(itemStack -> itemStack.getItem() instanceof PickaxeItem);
-
- boolean hasAxe = minerEntity.getMainHandItem().getItem() instanceof PickaxeItem;
- if(!hasAxe){
- minerEntity.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof PickaxeItem, 1, true),
- "miner_missing_pickaxe",
- Component.literal(minerEntity.getName().getString() + ": I need a pickaxe to continue."));
- this.blockPos = null;
- return;
- }
-
- boolean hasShovel = minerEntity.getInventory().hasAnyMatching(itemStack -> itemStack.getItem() instanceof PickaxeItem);
- if(!hasShovel){
- minerEntity.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof PickaxeItem, 1, true),
- "miner_missing_pickaxe",
- Component.literal(minerEntity.getName().getString() + ": I need a pickaxe to continue."));
- this.blockPos = null;
- return;
- }
-
- needToSeeBlock = true;
- setState(State.MINING);
- }
-
- case PREPARE_MINE_WALLS -> {
- this.minerEntity.getCurrentMiningArea().scanForOresOnWalls();
-
- this.stackToBreak = minerEntity.getCurrentMiningArea().stackToBreak;
- if(stackToBreak.isEmpty()){
- setState(State.CHECK);
- return;
- }
-
- minerEntity.switchMainHandItem(itemStack -> itemStack.getItem() instanceof PickaxeItem);
-
- boolean hasAxe = minerEntity.getMainHandItem().getItem() instanceof PickaxeItem;
- if(!hasAxe){
- minerEntity.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof PickaxeItem, 1, true),
- "miner_missing_pickaxe",
- Component.literal(minerEntity.getName().getString() + ": I need a pickaxe to continue."));
- this.blockPos = null;
- return;
- }
- needToSeeBlock = false;
- setState(State.MINE_WALLS);
- }
-
- case PREPARE_CLOSE_FLOOR -> {
- if(!this.minerEntity.getCurrentMiningArea().getCloseFloor()){
- setState(State.PREPARE_MINING);
- return;
- }
-
- if(minerEntity.getCurrentMiningArea().stackToPlace.isEmpty()){
- this.minerEntity.getCurrentMiningArea().scanFloorArea();
- }
-
- this.stackToPlace = minerEntity.getCurrentMiningArea().stackToPlace;
-
- if(stackToPlace.isEmpty()){
- setState(State.PREPARE_MINING);
- return;
- }
-
- setState(State.CLOSE_FLOOR);
- }
-
- case CLOSE_FLOOR -> {
- if(!this.minerEntity.getCurrentMiningArea().getCloseFloor()){
- setState(State.PREPARE_MINING);
- return;
- }
-
- minerEntity.switchMainHandItem(itemStack -> itemStack.is(Items.COBBLESTONE));
-
- if(this.closeHoles(this.stackToPlace)) return;
-
- setState(State.PREPARE_MINING);
- }
-
- case CHECK -> {
- this.minerEntity.getCurrentMiningArea().scanBreakArea();
- this.stackToBreak = this.minerEntity.getCurrentMiningArea().stackToBreak;
-
- if(stackToBreak.isEmpty()){
- if (this.minerEntity.getCurrentMiningArea().getMiningMode() == MiningArea.MiningMode.TUNNEL
- || this.minerEntity.getCurrentMiningArea().getMiningMode() == MiningArea.MiningMode.BRANCH) {
- if (this.minerEntity.getCurrentMiningArea().advancePatternSegment()) {
- setState(State.PREPARE_CLOSE_FLOOR);
- return;
- }
- }
- setState(State.DONE);
- }
- else{
- setState(State.PREPARE_CLOSE_FLOOR);
- }
- }
-
- case DONE -> {
- this.minerEntity.getCurrentMiningArea().setDone(true);
-
- blockPos = null;
- minerEntity.setCurrentWorkArea(null);
- this.start();
- minerEntity.clearWorkStatus();
-
- this.minerEntity.forcedDeposit = true;
- }
-
- case ERROR ->{
- if(!errorMessageDone){
- errorMessageDone = true;
- }
- }
- }
- }
-
- private boolean checkPlaceTorch() {
- if(minerEntity.getCommandSenderWorld().getRawBrightness(minerEntity.getOnPos().above(), 0) <= 7){
- BlockState onPosState = minerEntity.getCommandSenderWorld().getBlockState(minerEntity.getOnPos());
- BlockState stateAbove = minerEntity.getCommandSenderWorld().getBlockState(minerEntity.getOnPos().above());
- if(stateAbove.isAir() && !onPosState.isAir()){
- placeTorch();
- return true;
- }
-
- }
- return false;
- }
-
- public void placeTorch(){
- if (minerEntity.getInventory().hasAnyOf(ImmutableSet.of(Items.TORCH))){
- minerEntity.switchMainHandItem(itemStack -> itemStack.is(Items.TORCH));
-
- minerEntity.getCommandSenderWorld().setBlock(minerEntity.getOnPos().above(), Blocks.TORCH.defaultBlockState(), 3);
- minerEntity.getCommandSenderWorld().playSound(null, this.minerEntity.getX(), this.minerEntity.getY(), this.minerEntity.getZ(), SoundEvents.WOOD_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F);
-
- for (int i = 0; i < minerEntity.getInventory().getContainerSize(); ++i) {
- ItemStack itemstack = minerEntity.getInventory().getItem(i);
- if(itemstack.is(Items.TORCH)) itemstack.shrink(1);
- }
- }
- else{
- NeededItem torch = new NeededItem(itemStack -> itemStack.is(Items.TORCH), 16, true);
- if(!minerEntity.neededItems.contains(torch)) minerEntity.addNeededItem(torch);
- }
- }
-
- private boolean isMiningAreaAvailable() {
- MiningArea area = minerEntity.getCurrentMiningArea();
- if(area == null || !area.isRemoved()) return true;
- else {
- minerEntity.setCurrentWorkArea(null);
- }
- return false;
- }
-
- public void setState(State state) {
- //if(minerEntity.getOwner() != null) minerEntity.getOwner().sendSystemMessage(Component.literal(state.toString()));
- this.state = state;
- }
-
- int blockBreakTime;
- public boolean mineBlocks(Stack<BlockPos> positions){
- if(positions != null){
- if(blockPos == null){
- if(!positions.isEmpty()){
- blockPos = this.getNewMiningPosition(positions);
- }
- return blockPos != null;
- }
-
- BlockState state = minerEntity.getCommandSenderWorld().getBlockState(blockPos);
- if(state.isAir() || minerEntity.shouldIgnoreBlock(state)){
- if(!positions.isEmpty()){
- blockPos = this.getNewMiningPosition(positions);
- }
- else{
- this.blockPos = null;
- return false;
- }
- blockBreakTime = 0;
- }
- else{
- this.minerEntity.changeTool(state);
-
- this.minerEntity.mineBlock(blockPos);
- this.minerEntity.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- return false;
- }
-
- private BlockPos getNewMiningPosition(Stack<BlockPos> positions) {
- BlockPos newPosition = null;
-
- if(blockPos == null){
- if(this.needToSeeBlock){
- positions.removeIf(pos ->
- !canSeeBlock(minerEntity.getCommandSenderWorld(), minerEntity.position().add(0, 1, 0), pos)
- );
-
- }
-
- if(positions.isEmpty()){
- setState(State.MOVE_TO_WORK_AREA);
- return null;
- }
-
- newPosition = MiningPositionSelection.popNearest(positions, minerEntity.position());
- }
- else if(positions.contains(blockPos.above())){
- newPosition = blockPos.above();
- }
- else if(positions.contains(blockPos.below())){
- newPosition = blockPos.below();
- }
- else{
- newPosition = MiningPositionSelection.popNearest(positions, minerEntity.position());
- }
- return newPosition;
- }
-
- //PERFORMANCE HEAVY DO NOT USE FREQUENTLY
- private boolean canSeeBlock(Level level, Vec3 start, BlockPos target) {
- Vec3 targetCenter = target.getCenter();
- ClipContext ctx = new ClipContext(start, targetCenter, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, minerEntity);
- BlockPos ctxPos = level.clip(ctx).getBlockPos();
- return ctxPos.equals(target);
- }
-
- public boolean closeHoles(Stack<BlockPos> positions){
- if(positions != null){
- ItemStack cobbleBlockFromInv;
-
- cobbleBlockFromInv = minerEntity.getMatchingItem(itemStack -> itemStack.getItem() instanceof BlockItem blockItem && blockItem.getBlock().defaultBlockState().is(Blocks.COBBLESTONE));
- if(cobbleBlockFromInv == null){
- minerEntity.addNeededItem(new NeededItem(itemStack -> itemStack.getItem() instanceof BlockItem blockItem && blockItem.getBlock().defaultBlockState().is(Blocks.COBBLESTONE), 16, true));
- this.blockPos = null;
- return false;
- }
-
- if(blockPos == null){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- return false;
- }
- }
-
- BlockState state = minerEntity.getCommandSenderWorld().getBlockState(blockPos);
- FluidState fluid = minerEntity.getCommandSenderWorld().getFluidState(blockPos);
- if(!state.isAir() && fluid.isEmpty()){
- if(!positions.isEmpty()){
- blockPos = positions.pop();
- }
- else{
- return false;
- }
- }
- else if(cobbleBlockFromInv.getItem() instanceof BlockItem blockItem) {
- minerEntity.getCommandSenderWorld().setBlockAndUpdate(blockPos, blockItem.getBlock().defaultBlockState());
- minerEntity.getCommandSenderWorld().playSound(null, blockPos.getX(), blockPos.getY(), blockPos.getZ(), SoundEvents.STONE_PLACE, SoundSource.BLOCKS, 1.0F, 1.0F);
- cobbleBlockFromInv.shrink(1);
- this.minerEntity.swing(InteractionHand.MAIN_HAND);
- }
- return true;
- }
- this.blockPos = null;
- return false;
- }
- @Override
- public boolean canContinueToUse() {
- return canUse();
- }
-
- @Override
- public boolean isInterruptable() {
- return true;
- }
-
- @Override
- public boolean requiresUpdateEveryTick() {
- return true;
- }
-
- public static List<MiningArea> getAvailableWorkAreasByPriority(ServerLevel level, MinerEntity minerEntity, @Nullable MiningArea currentArea) {
- List<MiningArea> list = com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex.instance()
- .queryInRange(minerEntity, 64, MiningArea.class);
-
- Map<MiningArea, Integer> priorityMap = new HashMap<>();
-
- for (MiningArea area : list) {
- if (area == null || area == currentArea || !area.canWorkHere(minerEntity)) continue;
-
- if(area.isDone()) continue;
-
- int priority = 0;
-
- boolean perfectCandidate = area.isWorkerPerfectCandidate(minerEntity);
-
- if (perfectCandidate) {
- priority += 10;
- } else {
- priority += 1;
- }
-
- if (!area.isBeingWorkedOn()) {
- priority += 3;
- }
-
- priority += area.time;
- priority += WorkerBindingResume.priorityBoost(minerEntity.getBoundWorkAreaUUID(), area.getUUID());
-
- //double dist = area.position().distanceToSqr(minerEntity.position());
- //priority -= dist / 10.0;
-
- priorityMap.put(area, priority);
- }
-
-
- List<MiningArea> sorted = new ArrayList<>(priorityMap.keySet());
- sorted.sort((a, b) -> Integer.compare(priorityMap.get(b), priorityMap.get(a)));
-
- return sorted;
- }
-
-
-
- public boolean moveToPosition(BlockPos pos, int threshold){
- if(pos == null){
- return false;
- }
- else{
- double distance = minerEntity.getHorizontalDistanceTo(pos.getCenter());
- if(distance < threshold){
- minerEntity.getNavigation().stop();
- lastPathRequestPos = null;
- return false;
- }
- else{
-
- minerEntity.setFollowState(6); //Working
- if(shouldRequestPath(pos)){
- minerEntity.getNavigation().moveTo(pos.getX(), pos.getY(), pos.getZ(), 0.8F);
- }
- minerEntity.getLookControl().setLookAt(pos.getCenter());
- }
- return true;
- }
- }
-
- private boolean shouldRequestPath(BlockPos pos) {
- if(!pos.equals(lastPathRequestPos) || minerEntity.tickCount - lastPathRequestTick >= PATH_REQUEST_COOLDOWN_TICKS){
- lastPathRequestPos = pos;
- lastPathRequestTick = minerEntity.tickCount;
- return true;
- }
- return false;
- }
-
- public enum State{
- SELECT_WORK_AREA,
- MOVE_TO_WORK_AREA,
- PREPARE_MINE_WALLS,
- MINE_WALLS,
- PREPARE_CLOSE_FLOOR,
- CLOSE_FLOOR,
- PREPARE_MINING,
- MINING,
- CHECK,
- DONE,
- ERROR
-
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java b/src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java
index c4cea1d2..40664404 100644
--- a/src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java
+++ b/src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java
@@ -1,17 +1,23 @@
package com.talhanation.bannermod.ai.civilian;
import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
+import com.talhanation.bannermod.entity.civilian.AnimalFarmerEntity;
+import com.talhanation.bannermod.entity.civilian.FishermanEntity;
+import com.talhanation.bannermod.entity.civilian.FishingBobberEntity;
+import com.talhanation.bannermod.entity.civilian.workarea.AnimalPenArea;
import com.talhanation.bannermod.entity.civilian.workarea.BuildArea;
import com.talhanation.bannermod.entity.civilian.workarea.StorageArea;
import com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex;
import com.talhanation.bannermod.persistence.civilian.BuildBlockParse;
-import com.talhanation.bannermod.settlement.BannerModSettlementOrchestrator;
+import com.talhanation.bannermod.persistence.civilian.NeededItem;
+import com.talhanation.bannermod.settlement.SettlementOrchestrator;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderType;
import com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
+import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
@@ -19,9 +25,16 @@
import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.ai.goal.Goal;
+import net.minecraft.world.entity.animal.Animal;
+import net.minecraft.world.entity.animal.Cow;
+import net.minecraft.world.entity.animal.Sheep;
+import net.minecraft.world.entity.projectile.ThrownEgg;
+import net.minecraft.world.item.AxeItem;
import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.FishingRodItem;
import net.minecraft.world.item.HoeItem;
import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.ChestBlock;
@@ -31,6 +44,7 @@
import net.minecraft.world.level.block.StemBlock;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.Vec3;
import net.neoforged.neoforge.common.SpecialPlantable;
@@ -91,7 +105,7 @@ public boolean canUse() {
if (!(worker.getCommandSenderWorld() instanceof ServerLevel level)) {
return false;
}
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
if (runtime == null) {
return false;
}
@@ -107,7 +121,7 @@ public boolean canContinueToUse() {
if (!(worker.getCommandSenderWorld() instanceof ServerLevel level)) {
return false;
}
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
if (runtime == null) {
return false;
}
@@ -120,7 +134,7 @@ public void start() {
if (!(worker.getCommandSenderWorld() instanceof ServerLevel level)) {
return;
}
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
if (runtime == null) {
return;
}
@@ -155,7 +169,7 @@ public void tick() {
if (!(worker.getCommandSenderWorld() instanceof ServerLevel level)) {
return;
}
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(level);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(level);
if (runtime == null) {
return;
}
@@ -362,6 +376,10 @@ private void executeAt(ServerLevel level, BlockPos target, SettlementWorkOrderRu
case TILL_SOIL -> executeTillSoil(level, target, runtime);
case PLANT_CROP -> executePlantCrop(level, target, runtime);
case REPLANT_TREE -> executeReplantTree(level, target, runtime);
+ case FISH -> executeFish(target, runtime, level);
+ case ANIMAL_BREED -> executeAnimalBreed(level, target, runtime);
+ case ANIMAL_SPECIAL_TASK -> executeAnimalSpecialTask(level, target, runtime);
+ case ANIMAL_SLAUGHTER -> executeAnimalSlaughter(level, target, runtime);
case BUILD_BLOCK -> executeBuildBlock(level, target, runtime);
default -> {
// Placement-style or specialist types are left to legacy profession goals.
@@ -371,6 +389,209 @@ private void executeAt(ServerLevel level, BlockPos target, SettlementWorkOrderRu
}
}
+ private void executeFish(BlockPos target, SettlementWorkOrderRuntime runtime, ServerLevel level) {
+ if (!(worker instanceof FishermanEntity fisherman)) {
+ runtime.release(activeOrder.orderUuid());
+ this.activeOrder = null;
+ return;
+ }
+ if (!fisherman.hasFreeInvSlot()) {
+ fisherman.reportBlockedReason("fisherman_inventory_full", Component.literal(fisherman.getName().getString() + ": My inventory is full."));
+ fisherman.forcedDeposit = true;
+ runtime.release(activeOrder.orderUuid());
+ this.activeOrder = null;
+ return;
+ }
+
+ boolean hasFishingRod = fisherman.getInventory().hasAnyMatching(itemStack -> itemStack.getItem() instanceof FishingRodItem);
+ if (!hasFishingRod) {
+ fisherman.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof FishingRodItem, 1, true),
+ "fisherman_missing_rod",
+ Component.literal(fisherman.getName().getString() + ": I need a fishing rod to continue."));
+ runtime.release(activeOrder.orderUuid());
+ this.activeOrder = null;
+ return;
+ }
+
+ fisherman.clearWorkStatus();
+ fisherman.switchMainHandItem(itemStack -> itemStack.getItem() instanceof FishingRodItem);
+ fisherman.swing(InteractionHand.MAIN_HAND);
+ fisherman.playSound(SoundEvents.FISHING_BOBBER_THROW, 1, 1);
+ FishingBobberEntity fishingBobber = fisherman.throwFishingHook(target.getCenter());
+ fisherman.playSound(SoundEvents.FISHING_BOBBER_SPLASH, 1, 1);
+ fisherman.swing(InteractionHand.MAIN_HAND);
+ fisherman.playSound(SoundEvents.FISHING_BOBBER_RETRIEVE, 1, 1);
+ fisherman.spawnFishingLoot(fishingBobber);
+ fishingBobber.discard();
+ fisherman.farmedItems++;
+ if (fisherman.tickCount % 2 == 0) {
+ fisherman.damageMainHandItem();
+ }
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ }
+
+ private void executeAnimalBreed(ServerLevel level, BlockPos target, SettlementWorkOrderRuntime runtime) {
+ AnimalPenArea pen = activeAnimalPen(level, runtime);
+ if (pen == null) {
+ return;
+ }
+ if (!(worker instanceof AnimalFarmerEntity animalFarmer)) {
+ releaseActiveOrder(runtime);
+ return;
+ }
+ Animal animal = animalAt(level, pen, target);
+ if (animal == null) {
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ return;
+ }
+
+ animalFarmer.switchMainHandItem(itemStack -> itemStack.is(pen.getAnimalType().getBreedItem()));
+ if (!animalFarmer.getMainHandItem().is(pen.getAnimalType().getBreedItem())) {
+ animalFarmer.requestRequiredItem(new NeededItem(stack -> stack.is(pen.getAnimalType().getBreedItem()), 1, true),
+ "animal_farmer_missing_breed_item",
+ Component.literal(animalFarmer.getName().getString() + ": I need breeding items to continue."));
+ releaseActiveOrder(runtime);
+ return;
+ }
+
+ animalFarmer.getLookControl().setLookAt(animal);
+ animalFarmer.swing(InteractionHand.MAIN_HAND);
+ animalFarmer.getMainHandItem().shrink(1);
+ animal.setAge(0);
+ animal.setInLove(null);
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ }
+
+ private void executeAnimalSpecialTask(ServerLevel level, BlockPos target, SettlementWorkOrderRuntime runtime) {
+ AnimalPenArea pen = activeAnimalPen(level, runtime);
+ if (pen == null) {
+ return;
+ }
+ if (!(worker instanceof AnimalFarmerEntity animalFarmer)) {
+ releaseActiveOrder(runtime);
+ return;
+ }
+
+ if (pen.getAnimalType() == AnimalPenArea.AnimalTypes.CHICKEN) {
+ throwEggForPen(level, pen, animalFarmer, runtime);
+ return;
+ }
+
+ Animal animal = animalAt(level, pen, target);
+ if (animal == null) {
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ return;
+ }
+
+ animalFarmer.switchMainHandItem(itemStack -> itemStack.is(pen.getAnimalType().getSpecialItem()));
+ if (!animalFarmer.getMainHandItem().is(pen.getAnimalType().getSpecialItem())) {
+ animalFarmer.requestRequiredItem(new NeededItem(stack -> stack.is(pen.getAnimalType().getSpecialItem()), 1, true),
+ "animal_farmer_missing_special_item",
+ Component.literal(animalFarmer.getName().getString() + ": I need the right tool or item to continue."));
+ releaseActiveOrder(runtime);
+ return;
+ }
+
+ animalFarmer.getLookControl().setLookAt(animal);
+ if (pen.getAnimalType() == AnimalPenArea.AnimalTypes.SHEEP && animal instanceof Sheep sheep) {
+ sheep.shear(SoundSource.PLAYERS);
+ sheep.setSheared(true);
+ animalFarmer.swing(InteractionHand.MAIN_HAND);
+ animalFarmer.damageMainHandItem();
+ } else if (pen.getAnimalType() == AnimalPenArea.AnimalTypes.COW && animal instanceof Cow) {
+ animalFarmer.getMainHandItem().shrink(1);
+ animalFarmer.getInventory().addItem(Items.MILK_BUCKET.getDefaultInstance());
+ animal.playSound(SoundEvents.COW_MILK, 1.0F, 1.0F);
+ }
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ }
+
+ private void executeAnimalSlaughter(ServerLevel level, BlockPos target, SettlementWorkOrderRuntime runtime) {
+ AnimalPenArea pen = activeAnimalPen(level, runtime);
+ if (pen == null) {
+ return;
+ }
+ if (!(worker instanceof AnimalFarmerEntity animalFarmer)) {
+ releaseActiveOrder(runtime);
+ return;
+ }
+ Animal animal = animalAt(level, pen, target);
+ if (animal == null) {
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ return;
+ }
+
+ animalFarmer.switchMainHandItem(itemStack -> itemStack.getItem() instanceof AxeItem);
+ if (!(animalFarmer.getMainHandItem().getItem() instanceof AxeItem)) {
+ animalFarmer.requestRequiredItem(new NeededItem(stack -> stack.getItem() instanceof AxeItem, 1, true),
+ "animal_farmer_missing_axe",
+ Component.literal(animalFarmer.getName().getString() + ": I need an axe to continue."));
+ releaseActiveOrder(runtime);
+ return;
+ }
+
+ animalFarmer.getLookControl().setLookAt(animal);
+ animalFarmer.playSound(SoundEvents.PLAYER_ATTACK_STRONG);
+ animalFarmer.swing(InteractionHand.MAIN_HAND);
+ animal.kill();
+ animalFarmer.damageMainHandItem();
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ }
+
+ @Nullable
+ private AnimalPenArea activeAnimalPen(ServerLevel level, SettlementWorkOrderRuntime runtime) {
+ Entity entity = level.getEntity(activeOrder.buildingUuid());
+ if (entity instanceof AnimalPenArea pen && pen.isAlive()) {
+ return pen;
+ }
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ return null;
+ }
+
+ @Nullable
+ private Animal animalAt(ServerLevel level, AnimalPenArea pen, BlockPos target) {
+ return level.getEntitiesOfClass(Animal.class, new AABB(target).inflate(1.0D), pen::isCorrectAnimal)
+ .stream()
+ .min(Comparator.comparingDouble(animal -> animal.distanceToSqr(target.getCenter())))
+ .orElse(null);
+ }
+
+ private void throwEggForPen(ServerLevel level, AnimalPenArea pen, AnimalFarmerEntity animalFarmer, SettlementWorkOrderRuntime runtime) {
+ animalFarmer.switchMainHandItem(itemStack -> itemStack.is(Items.EGG));
+ if (!animalFarmer.getMainHandItem().is(Items.EGG)) {
+ animalFarmer.requestRequiredItem(new NeededItem(stack -> stack.is(Items.EGG), 32, false),
+ "animal_farmer_missing_special_item",
+ Component.literal(animalFarmer.getName().getString() + ": I need the right tool or item to continue."));
+ releaseActiveOrder(runtime);
+ return;
+ }
+
+ Vec3 center = pen.getArea().getCenter();
+ level.playSound(null, animalFarmer.getX(), animalFarmer.getY(), animalFarmer.getZ(), SoundEvents.EGG_THROW, SoundSource.PLAYERS, 0.5F,
+ 0.4F / (animalFarmer.getRandom().nextFloat() * 0.4F + 0.8F));
+ ThrownEgg thrownEgg = new ThrownEgg(level, animalFarmer);
+ thrownEgg.setItem(new ItemStack(Items.EGG));
+ thrownEgg.shoot(center.x() - animalFarmer.getX(), 0, center.z() - animalFarmer.getZ(), 0.1F, 0F);
+ if (level.addFreshEntity(thrownEgg)) {
+ animalFarmer.getMainHandItem().shrink(1);
+ }
+ completeActiveOrder(runtime, level);
+ this.activeOrder = null;
+ }
+
+ private void releaseActiveOrder(SettlementWorkOrderRuntime runtime) {
+ runtime.release(activeOrder.orderUuid());
+ this.activeOrder = null;
+ }
+
private static boolean isExecutableOrder(SettlementWorkOrder order) {
if (order == null) {
return false;
@@ -382,7 +603,18 @@ private static boolean isExecutableOrder(SettlementWorkOrder order) {
return false;
}
return switch (order.type()) {
- case HARVEST_CROP, BREAK_BLOCK, MINE_BLOCK, FELL_TREE, TILL_SOIL, PLANT_CROP, REPLANT_TREE, BUILD_BLOCK -> true;
+ case HARVEST_CROP,
+ BREAK_BLOCK,
+ MINE_BLOCK,
+ FELL_TREE,
+ FISH,
+ ANIMAL_BREED,
+ ANIMAL_SPECIAL_TASK,
+ ANIMAL_SLAUGHTER,
+ TILL_SOIL,
+ PLANT_CROP,
+ REPLANT_TREE,
+ BUILD_BLOCK -> true;
default -> false;
};
}
diff --git a/src/main/java/com/talhanation/bannermod/ai/military/AbstractRecruitObservedThreatGoal.java b/src/main/java/com/talhanation/bannermod/ai/military/AbstractRecruitObservedThreatGoal.java
index 2ff67741..6c5827f7 100644
--- a/src/main/java/com/talhanation/bannermod/ai/military/AbstractRecruitObservedThreatGoal.java
+++ b/src/main/java/com/talhanation/bannermod/ai/military/AbstractRecruitObservedThreatGoal.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.ai.military;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.goal.target.TargetGoal;
import net.minecraft.world.entity.ai.targeting.TargetingConditions;
diff --git a/src/main/java/com/talhanation/bannermod/ai/military/RecruitHoldPosGoal.java b/src/main/java/com/talhanation/bannermod/ai/military/RecruitHoldPosGoal.java
index 544797dc..acc05883 100644
--- a/src/main/java/com/talhanation/bannermod/ai/military/RecruitHoldPosGoal.java
+++ b/src/main/java/com/talhanation/bannermod/ai/military/RecruitHoldPosGoal.java
@@ -45,6 +45,12 @@ public boolean canContinueToUse() {
}
public void tick() {
+ LivingEntity leader = this.recruit.getOwner();
+ if (FormationDimensionGuard.shouldHoldDueToDimensionMismatch(this.recruit, leader)) {
+ this.recruit.getNavigation().stop();
+ return;
+ }
+
if (this.formationFallbackCooldown > 0) {
this.formationFallbackCooldown--;
}
@@ -86,10 +92,6 @@ private void tryGapFillScan() {
return;
}
// FORMATIONDIM-001: do not migrate formation slots while leader is in another dimension.
- LivingEntity leader = this.recruit.getOwner();
- if (FormationDimensionGuard.shouldHoldDueToDimensionMismatch(this.recruit, leader)) {
- return;
- }
CombatStance stance = this.recruit.getCombatStance();
if (!FormationGapFillPolicy.stanceAllowsGapFill(stance)) {
return;
diff --git a/src/main/java/com/talhanation/bannermod/events/ClaimEvent.java b/src/main/java/com/talhanation/bannermod/api/event/ClaimEvent.java
similarity index 98%
rename from src/main/java/com/talhanation/bannermod/events/ClaimEvent.java
rename to src/main/java/com/talhanation/bannermod/api/event/ClaimEvent.java
index 9c6c0738..089f2a39 100644
--- a/src/main/java/com/talhanation/bannermod/events/ClaimEvent.java
+++ b/src/main/java/com/talhanation/bannermod/api/event/ClaimEvent.java
@@ -1,4 +1,4 @@
-package com.talhanation.bannermod.events;
+package com.talhanation.bannermod.api.event;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
import net.minecraft.server.level.ServerLevel;
diff --git a/src/main/java/com/talhanation/bannermod/events/RecruitEvent.java b/src/main/java/com/talhanation/bannermod/api/event/RecruitEvent.java
similarity index 95%
rename from src/main/java/com/talhanation/bannermod/events/RecruitEvent.java
rename to src/main/java/com/talhanation/bannermod/api/event/RecruitEvent.java
index 1b3784a3..a1e6d7be 100644
--- a/src/main/java/com/talhanation/bannermod/events/RecruitEvent.java
+++ b/src/main/java/com/talhanation/bannermod/api/event/RecruitEvent.java
@@ -1,4 +1,4 @@
-package com.talhanation.bannermod.events;
+package com.talhanation.bannermod.api.event;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import net.minecraft.world.entity.player.Player;
@@ -110,7 +110,7 @@ public int getNewLevel() {
* Wird gefeuert, kurz bevor ein Recruit zu einem höheren Rang befördert wird.
* <p>Cancelable: {@code setCanceled(true)} verhindert die Beförderung.</p>
*
- * @see RecruitEvents#promoteRecruit(AbstractRecruitEntity, int, String, net.minecraft.server.level.ServerPlayer)
+ * @see com.talhanation.bannermod.entity.military.runtime.RecruitEvents#promoteRecruit(AbstractRecruitEntity, int, String, net.minecraft.server.level.ServerPlayer)
*/
public static class Promoted extends RecruitEvent implements ICancellableEvent {
private final int newProfession;
diff --git a/src/main/java/com/talhanation/bannermod/army/command/RecruitCommandAuthority.java b/src/main/java/com/talhanation/bannermod/army/command/RecruitCommandAuthority.java
index a75a416e..3802aa9f 100644
--- a/src/main/java/com/talhanation/bannermod/army/command/RecruitCommandAuthority.java
+++ b/src/main/java/com/talhanation/bannermod/army/command/RecruitCommandAuthority.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.army.command;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import net.minecraft.server.level.ServerPlayer;
diff --git a/src/main/java/com/talhanation/bannermod/army/command/runtime/MovementFormationCommandService.java b/src/main/java/com/talhanation/bannermod/army/command/runtime/MovementFormationCommandService.java
index aa1eb373..42e48f03 100644
--- a/src/main/java/com/talhanation/bannermod/army/command/runtime/MovementFormationCommandService.java
+++ b/src/main/java/com/talhanation/bannermod/army/command/runtime/MovementFormationCommandService.java
@@ -7,7 +7,7 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.CaptainEntity;
import com.talhanation.bannermod.entity.military.RecruitIndex;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import com.talhanation.bannermod.util.RuntimeProfilingCounters;
import com.talhanation.bannermod.util.FormationUtils;
diff --git a/src/main/java/com/talhanation/bannermod/bootstrap/BannerModMain.java b/src/main/java/com/talhanation/bannermod/bootstrap/BannerModMain.java
index 9b428cae..2e0b0313 100644
--- a/src/main/java/com/talhanation/bannermod/bootstrap/BannerModMain.java
+++ b/src/main/java/com/talhanation/bannermod/bootstrap/BannerModMain.java
@@ -6,7 +6,7 @@
import com.talhanation.bannermod.events.DamageEvent;
import com.talhanation.bannermod.events.PillagerEvents;
import com.talhanation.bannermod.events.RecruitCombatEvents;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.events.RecruitLifecycleEvents;
import com.talhanation.bannermod.events.VillagerEvents;
import com.talhanation.bannermod.events.WorkersVillagerEvents;
@@ -22,6 +22,7 @@
import com.talhanation.bannermod.compat.MedievalSiegeMachinesCompat;
import com.talhanation.bannermod.config.BannerModServerConfig;
import com.talhanation.bannermod.config.RecruitsClientConfig;
+import com.talhanation.bannermod.entity.military.perks.PerkReloadListener;
import com.talhanation.bannermod.war.config.WarServerConfig;
import com.talhanation.bannermod.war.events.WarPvpEvents;
import com.talhanation.bannermod.war.events.WarRevoltAutoResolver;
@@ -30,6 +31,7 @@
import net.neoforged.api.distmarker.Dist;
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.AddReloadListenerEvent;
import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
import net.neoforged.neoforge.event.RegisterCommandsEvent;
import net.neoforged.bus.api.IEventBus;
@@ -75,6 +77,8 @@ public BannerModMain(IEventBus modEventBus, Dist dist, ModContainer modContainer
modEventBus.addListener(this::setup);
modEventBus.addListener(BannerModNetworkBootstrap::registerPayloads);
+ com.talhanation.bannermod.registry.ModAttachments.ATTACHMENT_TYPES.register(modEventBus);
+
// Register military deferred registers (from bannermod.registry.military)
com.talhanation.bannermod.registry.military.ModBlocks.BLOCKS.register(modEventBus);
com.talhanation.bannermod.registry.military.ModPois.POIS.register(modEventBus);
@@ -123,6 +127,11 @@ public void onRegisterCommands(RegisterCommandsEvent event) {
BannerModWarCommands.register(event.getDispatcher());
}
+ @SubscribeEvent
+ public void onAddReloadListeners(AddReloadListenerEvent event) {
+ event.addListener(new PerkReloadListener());
+ }
+
@SuppressWarnings({"unchecked", "rawtypes"})
private void setup(final FMLCommonSetupEvent event) {
// Workers runtime events
diff --git a/src/main/java/com/talhanation/bannermod/client/civilian/gui/CitizenProfileScreen.java b/src/main/java/com/talhanation/bannermod/client/civilian/gui/CitizenProfileScreen.java
index 2f32bfda..39b21c9e 100644
--- a/src/main/java/com/talhanation/bannermod/client/civilian/gui/CitizenProfileScreen.java
+++ b/src/main/java/com/talhanation/bannermod/client/civilian/gui/CitizenProfileScreen.java
@@ -1,12 +1,15 @@
package com.talhanation.bannermod.client.civilian.gui;
import com.talhanation.bannermod.client.military.ClientManager;
+import com.talhanation.bannermod.client.civilian.input.AssignHomeTargetSelector;
import com.talhanation.bannermod.client.military.gui.MilitaryGuiStyle;
import com.talhanation.bannermod.citizen.CitizenProfession;
import com.talhanation.bannermod.entity.citizen.CitizenEntity;
import com.talhanation.bannermod.inventory.civilian.CitizenProfileMenu;
import com.talhanation.bannermod.persistence.military.RecruitsPlayerInfo;
import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.Tooltip;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
import net.minecraft.network.chat.Component;
@@ -47,6 +50,16 @@ protected void init() {
}
}
).bounds(buttonX, buttonY, 134, 16).build());
+
+ Button assignHome = Button.builder(
+ Component.translatable("bannermod.assign_home.button"),
+ button -> {
+ AssignHomeTargetSelector.start(this.citizen.getUUID());
+ this.onClose();
+ }
+ ).bounds(this.leftPos + 14, this.topPos + 140, 70, 16).build();
+ assignHome.setTooltip(Tooltip.create(Component.translatable("bannermod.assign_home.tooltip")));
+ this.addRenderableWidget(assignHome);
}
@Override
diff --git a/src/main/java/com/talhanation/bannermod/client/civilian/gui/WorkerStatusScreen.java b/src/main/java/com/talhanation/bannermod/client/civilian/gui/WorkerStatusScreen.java
index 3d48883a..4c888225 100644
--- a/src/main/java/com/talhanation/bannermod/client/civilian/gui/WorkerStatusScreen.java
+++ b/src/main/java/com/talhanation/bannermod/client/civilian/gui/WorkerStatusScreen.java
@@ -3,11 +3,13 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.citizen.CitizenProfession;
import com.talhanation.bannermod.citizen.CitizenRole;
+import com.talhanation.bannermod.client.civilian.input.AssignHomeTargetSelector;
import com.talhanation.bannermod.client.military.gui.MilitaryGuiStyle;
import com.talhanation.bannermod.client.military.gui.widgets.ActionMenuButton;
import com.talhanation.bannermod.client.military.gui.widgets.ContextMenuEntry;
import com.talhanation.bannermod.entity.civilian.WorkerInspectionSnapshot;
import com.talhanation.bannermod.network.messages.civilian.MessageConvertWorkerToCitizen;
+import com.talhanation.bannermod.network.messages.civilian.MessageDismissWorker;
import com.talhanation.bannermod.network.messages.civilian.MessageOpenWorkerScreen;
import com.talhanation.bannermod.network.messages.civilian.MessageReassignWorkerProfession;
import net.minecraft.client.Minecraft;
@@ -22,11 +24,11 @@
import java.util.Locale;
public class WorkerStatusScreen extends Screen {
- private static final int WIDTH = 252;
+ private static final int WIDTH = 300;
// 210 gives 22 px clearance between the bottom transport text box (ends at top+168)
// and the action button row (starts at top + HEIGHT - 26 = top+184) so they never overlap.
private static final int HEIGHT = 210;
- private static final int BTN_W = 58;
+ private static final int BTN_W = 54;
private static final int BTN_H = 20;
private final WorkerInspectionSnapshot snapshot;
@@ -44,10 +46,10 @@ protected void init() {
this.left = (this.width - WIDTH) / 2;
this.top = (this.height - HEIGHT) / 2;
- // Bottom action row: 4 evenly spaced buttons inside WIDTH.
- // Stride between centers = (WIDTH - 16) / 4 = 59 -> stays inside parchment frame.
+ // Bottom action row: 5 evenly spaced buttons inside WIDTH.
+ // Stride between centers = (WIDTH - 16) / 5 = 56 -> stays inside parchment frame.
int rowY = this.top + HEIGHT - 26;
- int strideX = (WIDTH - 16) / 4;
+ int strideX = (WIDTH - 16) / 5;
int firstCenter = this.left + 8 + strideX / 2;
SmallCommandButton refresh = this.addRenderableWidget(new SmallCommandButton(
@@ -57,20 +59,35 @@ protected void init() {
));
refresh.setTooltip(Tooltip.create(text("gui.bannermod.worker_screen.refresh.tooltip")));
- SmallCommandButton convert = this.addRenderableWidget(new SmallCommandButton(
- firstCenter + strideX - BTN_W / 2, rowY, BTN_W, BTN_H,
- clamped("gui.bannermod.worker_screen.convert"),
+ SmallCommandButton assignHome = this.addRenderableWidget(new SmallCommandButton(
+ firstCenter + 3 * strideX - BTN_W / 2, rowY, BTN_W, BTN_H,
+ clamped("bannermod.assign_home.button"),
button -> {
- BannerModMain.SIMPLE_CHANNEL.sendToServer(new MessageConvertWorkerToCitizen(this.snapshot.workerUuid()));
+ AssignHomeTargetSelector.start(this.snapshot.workerUuid());
this.onClose();
}
));
- convert.active = this.snapshot.canConvert();
+ assignHome.setTooltip(Tooltip.create(text("bannermod.assign_home.tooltip")));
+
+ SmallCommandButton close = this.addRenderableWidget(new SmallCommandButton(
+ firstCenter + 4 * strideX - BTN_W / 2, rowY, BTN_W, BTN_H,
+ clamped("gui.bannermod.worker_screen.close"),
+ button -> this.onClose()
+ ));
+ close.setTooltip(Tooltip.create(text("gui.bannermod.worker_screen.close.tooltip")));
+
+ ActionMenuButton workerActions = new ActionMenuButton(
+ firstCenter + strideX - BTN_W / 2, rowY, BTN_W, BTN_H,
+ clamped("gui.bannermod.worker_screen.actions"),
+ buildWorkerActionEntries()
+ );
+ workerActions.setOpenUpward(true);
if (this.snapshot.convertBlockedReasonKey() != null) {
- convert.setTooltip(Tooltip.create(text(this.snapshot.convertBlockedReasonKey())));
+ workerActions.setTooltip(Tooltip.create(text(this.snapshot.convertBlockedReasonKey())));
} else {
- convert.setTooltip(Tooltip.create(text("gui.bannermod.worker_screen.convert.tooltip.dismiss_path")));
+ workerActions.setTooltip(Tooltip.create(text("gui.bannermod.worker_screen.actions.tooltip")));
}
+ this.addRenderableWidget(workerActions);
// Reassign — opens an ActionMenuButton with one row per available
// CONTROLLED_WORKER profession (current one filtered out). Server is
@@ -84,13 +101,6 @@ protected void init() {
reassign.setTooltip(Tooltip.create(text("gui.bannermod.worker_screen.reassign.tooltip")));
reassign.active = this.snapshot.canConvert();
this.addRenderableWidget(reassign);
-
- SmallCommandButton close = this.addRenderableWidget(new SmallCommandButton(
- firstCenter + 3 * strideX - BTN_W / 2, rowY, BTN_W, BTN_H,
- clamped("gui.bannermod.worker_screen.close"),
- button -> this.onClose()
- ));
- close.setTooltip(Tooltip.create(text("gui.bannermod.worker_screen.close.tooltip")));
}
private List<ContextMenuEntry> buildReassignEntries() {
@@ -116,6 +126,27 @@ private List<ContextMenuEntry> buildReassignEntries() {
return entries;
}
+ private List<ContextMenuEntry> buildWorkerActionEntries() {
+ List<ContextMenuEntry> entries = new ArrayList<>();
+ entries.add(new ContextMenuEntry(
+ Component.translatable("gui.bannermod.worker_screen.convert").getString(),
+ () -> {
+ BannerModMain.SIMPLE_CHANNEL.sendToServer(new MessageConvertWorkerToCitizen(this.snapshot.workerUuid()));
+ this.onClose();
+ },
+ this.snapshot.canConvert()
+ ));
+ entries.add(new ContextMenuEntry(
+ Component.translatable("gui.bannermod.worker_screen.dismiss").getString(),
+ () -> {
+ BannerModMain.SIMPLE_CHANNEL.sendToServer(new MessageDismissWorker(this.snapshot.workerUuid()));
+ this.onClose();
+ },
+ true
+ ));
+ return entries;
+ }
+
@Override
public void renderBackground(GuiGraphics graphics, int mouseX, int mouseY, float partialTick) {
super.renderBackground(graphics, mouseX, mouseY, partialTick);
@@ -179,7 +210,7 @@ public boolean isPauseScreen() {
/**
* Narrow command button styled with the same parchment-iron palette as
* {@link com.talhanation.bannermod.client.military.gui.group.RecruitsCommandButton}
- * but width-configurable so four widgets fit inside WIDTH=252.
+ * but width-configurable so the compact action row fits inside the ledger.
*/
private static class SmallCommandButton extends ExtendedButton {
SmallCommandButton(int x, int y, int width, int height, Component label, OnPress handler) {
diff --git a/src/main/java/com/talhanation/bannermod/client/civilian/input/AssignHomeTargetSelector.java b/src/main/java/com/talhanation/bannermod/client/civilian/input/AssignHomeTargetSelector.java
new file mode 100644
index 00000000..bfed7a09
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/client/civilian/input/AssignHomeTargetSelector.java
@@ -0,0 +1,100 @@
+package com.talhanation.bannermod.client.civilian.input;
+
+import com.talhanation.bannermod.bootstrap.BannerModMain;
+import com.talhanation.bannermod.client.military.gui.MilitaryGuiStyle;
+import com.talhanation.bannermod.network.messages.civilian.MessageAssignHome;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.HitResult;
+
+import java.util.UUID;
+
+public final class AssignHomeTargetSelector {
+ private static final long TIMEOUT_MS = 30_000L;
+ private static final int PANEL_WIDTH = 214;
+ private static final int PANEL_HEIGHT = 30;
+ private static final int RIGHT_SAFE_MARGIN = 8;
+
+ private static UUID entityUuid;
+ private static long startedAtMs;
+
+ private AssignHomeTargetSelector() {
+ }
+
+ public static void start(UUID targetEntityUuid) {
+ entityUuid = targetEntityUuid;
+ startedAtMs = System.currentTimeMillis();
+ Minecraft mc = Minecraft.getInstance();
+ if (mc.player != null) {
+ mc.player.displayClientMessage(Component.translatable("bannermod.assign_home.prompt"), true);
+ }
+ }
+
+ public static boolean isActive() {
+ return entityUuid != null;
+ }
+
+ public static void reset() {
+ clear();
+ }
+
+ public static void tick() {
+ if (!isActive()) return;
+ if (System.currentTimeMillis() - startedAtMs >= TIMEOUT_MS) {
+ cancel("bannermod.assign_home.cancel.timeout");
+ }
+ }
+
+ public static boolean cancelWithEscape() {
+ if (!isActive()) return false;
+ cancel("bannermod.assign_home.cancel.escape");
+ return true;
+ }
+
+ public static boolean handleUseOnTargetedBlock() {
+ if (!isActive()) return false;
+ Minecraft mc = Minecraft.getInstance();
+ if (!(mc.hitResult instanceof BlockHitResult hit) || mc.hitResult.getType() != HitResult.Type.BLOCK) {
+ return false;
+ }
+ UUID uuid = entityUuid;
+ BlockPos pos = hit.getBlockPos().immutable();
+ clear();
+ BannerModMain.SIMPLE_CHANNEL.sendToServer(new MessageAssignHome(uuid, pos));
+ return true;
+ }
+
+ public static int renderPrompt(GuiGraphics graphics, Minecraft mc, int y) {
+ if (!isActive() || mc.player == null) return y;
+ Font font = mc.font;
+ int x = Math.max(6, graphics.guiWidth() - PANEL_WIDTH - RIGHT_SAFE_MARGIN);
+ MilitaryGuiStyle.parchmentPanel(graphics, x, y, PANEL_WIDTH, PANEL_HEIGHT);
+ graphics.drawString(font, Component.translatable("bannermod.assign_home.hud.title"), x + 8, y + 6,
+ MilitaryGuiStyle.TEXT_DARK, false);
+ graphics.drawString(font, Component.translatable("bannermod.assign_home.hud.remaining", remainingSeconds()),
+ x + 8, y + 18, MilitaryGuiStyle.TEXT_MUTED, false);
+ return y + PANEL_HEIGHT + 4;
+ }
+
+ private static int remainingSeconds() {
+ long remainingMs = Math.max(0L, TIMEOUT_MS - (System.currentTimeMillis() - startedAtMs));
+ return (int) Math.ceil(remainingMs / 1000.0D);
+ }
+
+ private static void cancel(String messageKey) {
+ clear();
+ Minecraft mc = Minecraft.getInstance();
+ if (mc.player != null) {
+ mc.player.displayClientMessage(Component.translatable(messageKey), true);
+ }
+ }
+
+ private static void clear() {
+ entityUuid = null;
+ startedAtMs = 0L;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/client/military/events/ClientPlayerEvents.java b/src/main/java/com/talhanation/bannermod/client/military/events/ClientPlayerEvents.java
index 1640c43b..1ac246d2 100644
--- a/src/main/java/com/talhanation/bannermod/client/military/events/ClientPlayerEvents.java
+++ b/src/main/java/com/talhanation/bannermod/client/military/events/ClientPlayerEvents.java
@@ -1,5 +1,6 @@
package com.talhanation.bannermod.client.military.events;
+import com.talhanation.bannermod.client.civilian.input.AssignHomeTargetSelector;
import com.talhanation.bannermod.client.military.gui.worldmap.ChunkTileManager;
import com.talhanation.bannermod.client.military.gui.worldmap.WorldMapScreen;
import com.talhanation.bannermod.config.RecruitsClientConfig;
@@ -12,6 +13,8 @@
public class ClientPlayerEvents {
@SubscribeEvent
public void onClientTick(ClientTickEvent.Post event) {
+ AssignHomeTargetSelector.tick();
+
if (!(Minecraft.getInstance().screen instanceof WorldMapScreen screen)) return;
if (!RecruitsClientConfig.UpdateMapTiles.get()) return;
@@ -36,6 +39,7 @@ public void onWorldLoad(LevelEvent.Load event) {
@SubscribeEvent
public void onWorldUnload(LevelEvent.Unload event) {
if (event.getLevel().isClientSide()) {
+ AssignHomeTargetSelector.reset();
ChunkTileManager.getInstance().close();
}
}
diff --git a/src/main/java/com/talhanation/bannermod/client/military/events/KeyEvents.java b/src/main/java/com/talhanation/bannermod/client/military/events/KeyEvents.java
index b6beb612..7413dd5a 100644
--- a/src/main/java/com/talhanation/bannermod/client/military/events/KeyEvents.java
+++ b/src/main/java/com/talhanation/bannermod/client/military/events/KeyEvents.java
@@ -3,6 +3,7 @@
import com.talhanation.bannermod.events.CommandEvents;
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.client.civilian.gui.WorkerCommandScreen;
+import com.talhanation.bannermod.client.civilian.input.AssignHomeTargetSelector;
import com.talhanation.bannermod.client.civilian.render.WorkerAreaRenderer;
import com.talhanation.bannermod.client.military.gui.war.WarListScreen;
import com.talhanation.bannermod.client.military.gui.worldmap.WorldMapScreen;
@@ -21,6 +22,7 @@
import net.neoforged.api.distmarker.OnlyIn;
import net.neoforged.neoforge.client.event.InputEvent;
import net.neoforged.bus.api.SubscribeEvent;
+import org.lwjgl.glfw.GLFW;
@OnlyIn(Dist.CLIENT)
@@ -32,6 +34,11 @@ public void onKeyInput(InputEvent.Key event) {
if (clientPlayerEntity == null)
return;
+ if (event.getKey() == GLFW.GLFW_KEY_ESCAPE && event.getAction() == GLFW.GLFW_PRESS
+ && AssignHomeTargetSelector.cancelWithEscape()) {
+ return;
+ }
+
if (ModShortcuts.COMMAND_SCREEN_KEY != null && ModShortcuts.COMMAND_SCREEN_KEY.consumeClick()) {
CommandEvents.openCommandScreen(clientPlayerEntity);
}
@@ -70,6 +77,11 @@ public void onKeyInput(InputEvent.Key event) {
@SubscribeEvent
public void onPlayerPick(InputEvent.InteractionKeyMappingTriggered event){
+ if (event.isUseItem() && AssignHomeTargetSelector.handleUseOnTargetedBlock()) {
+ event.setCanceled(true);
+ return;
+ }
+
if(event.isPickBlock()){
Minecraft minecraft = Minecraft.getInstance();
LocalPlayer clientPlayerEntity = minecraft.player;
diff --git a/src/main/java/com/talhanation/bannermod/client/military/gui/RecruitInventoryScreen.java b/src/main/java/com/talhanation/bannermod/client/military/gui/RecruitInventoryScreen.java
index 6d5aa0ee..82f527b8 100644
--- a/src/main/java/com/talhanation/bannermod/client/military/gui/RecruitInventoryScreen.java
+++ b/src/main/java/com/talhanation/bannermod/client/military/gui/RecruitInventoryScreen.java
@@ -3,7 +3,8 @@
import com.mojang.blaze3d.systems.RenderSystem;
import com.talhanation.bannermod.ai.military.CombatStance;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.client.civilian.input.AssignHomeTargetSelector;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.client.military.ClientManager;
import com.talhanation.bannermod.client.military.gui.widgets.ActionMenuButton;
import com.talhanation.bannermod.client.military.gui.widgets.ContextMenuEntry;
@@ -110,6 +111,8 @@ public class RecruitInventoryScreen extends ScreenBase<RecruitInventoryMenu> {
private static final MutableComponent TEXT_MENU_AGGRO = Component.translatable("gui.recruits.command.menu.aggro");
private static final MutableComponent TEXT_MENU_ORDERS = Component.translatable("gui.recruits.inv.menu.orders");
private static final MutableComponent TEXT_MENU_MOUNT = Component.translatable("gui.recruits.inv.menu.mount");
+ private static final MutableComponent TEXT_ASSIGN_HOME = Component.translatable("bannermod.assign_home.button");
+ private static final MutableComponent TOOLTIP_ASSIGN_HOME = Component.translatable("bannermod.assign_home.tooltip");
private static final MutableComponent STATUS_READ_ONLY = Component.translatable("gui.recruits.inv.status.read_only");
private static final MutableComponent STATUS_GROUP_UNSET = Component.translatable("gui.recruits.inv.status.group_unset");
private static final MutableComponent STATUS_GROUP_LOCKED = Component.translatable("gui.recruits.inv.status.group_locked");
@@ -310,6 +313,13 @@ protected void init() {
if (!moreButton.active) moreButton.setTooltip(Tooltip.create(TOOLTIP_NOBLE_LOCKED));
addRenderableWidget(moreButton);
+ Button assignHome = addRenderableWidget(new ProfileButton(zeroLeftPos, zeroTopPos + (20 + topPosGab) * 6,
+ 80, 20, TEXT_ASSIGN_HOME, button -> {
+ AssignHomeTargetSelector.start(this.recruit.getUUID());
+ this.onClose();
+ }));
+ assignHome.setTooltip(Tooltip.create(TOOLTIP_ASSIGN_HOME));
+
if(recruit instanceof VillagerNobleEntity){
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/client/military/gui/overlay/HudOverlayCoordinator.java b/src/main/java/com/talhanation/bannermod/client/military/gui/overlay/HudOverlayCoordinator.java
index 53734872..fc6ee29d 100644
--- a/src/main/java/com/talhanation/bannermod/client/military/gui/overlay/HudOverlayCoordinator.java
+++ b/src/main/java/com/talhanation/bannermod/client/military/gui/overlay/HudOverlayCoordinator.java
@@ -1,6 +1,7 @@
package com.talhanation.bannermod.client.military.gui.overlay;
import com.talhanation.bannermod.bootstrap.BannerModMain;
+import com.talhanation.bannermod.client.civilian.input.AssignHomeTargetSelector;
import com.talhanation.bannermod.client.military.ClientManager;
import com.talhanation.bannermod.client.military.api.ClientClaimEvent;
import com.talhanation.bannermod.client.military.api.ClientOverlayEvent;
@@ -124,7 +125,7 @@ private void renderOverlays(GuiGraphics graphics) {
if (mc.player == null || mc.level == null) return;
if (mc.options.hideGui || mc.getDebugOverlay().showDebugScreen() || mc.options.keyPlayerList.isDown()) return;
- int y = TOP_SAFE_MARGIN;
+ int y = AssignHomeTargetSelector.renderPrompt(graphics, mc, TOP_SAFE_MARGIN);
y = renderBattleWindow(graphics, mc, y);
y = renderSiegeZone(graphics, mc, y);
renderClaim(graphics, mc, y);
diff --git a/src/main/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirror.java b/src/main/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirror.java
index 1df7265b..ec4f4e97 100644
--- a/src/main/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirror.java
+++ b/src/main/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirror.java
@@ -3,9 +3,9 @@
import com.talhanation.bannermod.governance.BannerModGovernorPolicy;
import com.talhanation.bannermod.governance.BannerModGovernorRecommendation;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementStrategicSignals;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementStrategicSignals;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Envelope;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Payload;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.RefreshTrigger;
@@ -52,13 +52,13 @@ public GovernorView governorView(UUID recruitId) {
}
Payload payload = envelope.payload();
- BannerModSettlementSnapshot settlement = payload.settlementSnapshot();
+ SettlementSnapshot settlement = payload.settlementSnapshot();
BannerModGovernorSnapshot governor = payload.governorSnapshot();
boolean stale = envelope.isStale();
List<String> recommendations = governor == null ? List.of() : new ArrayList<>(governor.recommendationTokens());
if (settlement != null) {
recommendations = new ArrayList<>(recommendations);
- recommendations.addAll(settlement.tradeRouteHandoffSeed().seaTradeStatusLines());
+ recommendations.addAll(settlement.tradeRouteHandoffSnapshot().seaTradeStatusLines());
}
return new GovernorView(
@@ -88,7 +88,7 @@ public GovernorView governorView(UUID recruitId) {
);
}
- private static List<String> buildLogisticsLines(@Nullable BannerModSettlementSnapshot settlement) {
+ private static List<String> buildLogisticsLines(@Nullable SettlementSnapshot settlement) {
if (settlement == null) {
return List.of("gui.bannermod.governor.logistics.none");
}
@@ -101,13 +101,13 @@ private static List<String> buildLogisticsLines(@Nullable BannerModSettlementSna
lines.add("gui.bannermod.governor.logistics.stockpile "
+ settlement.stockpileSummary().containerCount() + " "
+ settlement.stockpileSummary().slotCapacity());
- BannerModSettlementStrategicSignals signals = BannerModSettlementStrategicSignals.fromSnapshot(settlement);
+ SettlementStrategicSignals signals = SettlementStrategicSignals.fromSnapshot(settlement);
lines.add("gui.bannermod.governor.logistics.role " + signals.roleId());
- List<BannerModSettlementDesiredGoodSeed> desiredGoods = settlement.desiredGoodsSeed().desiredGoods();
+ List<SettlementDesiredGoodSnapshot> desiredGoods = settlement.desiredGoodsSnapshot().desiredGoods();
lines.add(desiredGoods.isEmpty()
? "gui.bannermod.governor.logistics.goods_none"
: "gui.bannermod.governor.logistics.goods " + desiredGoods.get(0).desiredGoodId() + " " + desiredGoods.get(0).driverCount());
- lines.addAll(settlement.tradeRouteHandoffSeed().seaTradeStatusLines());
+ lines.addAll(settlement.tradeRouteHandoffSnapshot().seaTradeStatusLines());
return lines;
}
diff --git a/src/main/java/com/talhanation/bannermod/commands/admin/AdminDebugCommands.java b/src/main/java/com/talhanation/bannermod/commands/admin/AdminDebugCommands.java
new file mode 100644
index 00000000..a046d4b5
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/commands/admin/AdminDebugCommands.java
@@ -0,0 +1,192 @@
+package com.talhanation.bannermod.commands.admin;
+
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.talhanation.bannermod.ai.pathfinding.GlobalPathfindingController;
+import com.talhanation.bannermod.entity.civilian.WorkerIndex;
+import com.talhanation.bannermod.entity.civilian.workarea.AbstractWorkAreaEntity;
+import com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex;
+import com.talhanation.bannermod.entity.military.RecruitIndex;
+import com.talhanation.bannermod.governance.BannerModGovernorManager;
+import com.talhanation.bannermod.governance.BannerModTreasuryManager;
+import com.talhanation.bannermod.persistence.military.RecruitPlayerUnitSaveData;
+import com.talhanation.bannermod.persistence.military.RecruitsClaimSaveData;
+import com.talhanation.bannermod.persistence.military.RecruitsGroupsSaveData;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.bootstrap.SettlementRegistryData;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRegistryData;
+import com.talhanation.bannermod.settlement.dispatch.BannerModSellerDispatchSavedData;
+import com.talhanation.bannermod.settlement.household.BannerModHomeAssignmentSavedData;
+import com.talhanation.bannermod.settlement.prefab.player.PlayerBuildingRegistrySavedData;
+import com.talhanation.bannermod.settlement.project.SettlementProjectSavedData;
+import com.talhanation.bannermod.settlement.validation.BuildingInvalidationQueueData;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderSavedData;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeExecutionSavedData;
+import com.talhanation.bannermod.util.RuntimeProfilingCounters;
+import com.talhanation.bannermod.war.audit.WarAuditLogSavedData;
+import com.talhanation.bannermod.war.cooldown.WarCooldownSavedData;
+import com.talhanation.bannermod.war.registry.WarPoliticalRegistrySavedData;
+import com.talhanation.bannermod.war.runtime.DemilitarizationSavedData;
+import com.talhanation.bannermod.war.runtime.OccupationSavedData;
+import com.talhanation.bannermod.war.runtime.RevoltSavedData;
+import com.talhanation.bannermod.war.runtime.SiegeStandardSavedData;
+import com.talhanation.bannermod.war.runtime.WarAllyInviteSavedData;
+import com.talhanation.bannermod.war.runtime.WarDeclarationSavedData;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.ChunkPos;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.Map;
+
+public final class AdminDebugCommands {
+ private static final SimpleCommandExceptionType INVALID_CHUNK = new SimpleCommandExceptionType(
+ Component.literal("chunk must be formatted as x,z")
+ );
+ private static final SimpleCommandExceptionType SERVER_ONLY = new SimpleCommandExceptionType(
+ Component.literal("This command can only run on a server")
+ );
+ private static final List<Class<?>> VERSIONED_SAVED_DATA = List.of(
+ RecruitsClaimSaveData.class,
+ RecruitsGroupsSaveData.class,
+ RecruitPlayerUnitSaveData.class,
+ BannerModSeaTradeExecutionSavedData.class,
+ WarPoliticalRegistrySavedData.class,
+ WarCooldownSavedData.class,
+ WarAllyInviteSavedData.class,
+ OccupationSavedData.class,
+ RevoltSavedData.class,
+ DemilitarizationSavedData.class,
+ SiegeStandardSavedData.class,
+ WarDeclarationSavedData.class,
+ WarAuditLogSavedData.class,
+ BannerModGovernorManager.class,
+ BannerModTreasuryManager.class,
+ BannerModSellerDispatchSavedData.class,
+ SettlementWorkOrderSavedData.class,
+ BannerModHomeAssignmentSavedData.class,
+ SettlementManager.class,
+ SettlementRegistryData.class,
+ BuildingInvalidationQueueData.class,
+ ValidatedBuildingRegistryData.class,
+ SettlementProjectSavedData.class,
+ PlayerBuildingRegistrySavedData.class
+ );
+
+ private AdminDebugCommands() {
+ }
+
+ public static LiteralArgumentBuilder<CommandSourceStack> debug() {
+ return Commands.literal("debug")
+ .requires(source -> source.hasPermission(2))
+ .then(Commands.literal("index")
+ .then(indexTarget("recruits"))
+ .then(indexTarget("workers"))
+ .then(indexTarget("workareas")))
+ .then(Commands.literal("pathfinding")
+ .then(Commands.literal("stats")
+ .executes(AdminDebugCommands::pathfindingStats)))
+ .then(Commands.literal("counters")
+ .then(Commands.literal("dump")
+ .executes(AdminDebugCommands::countersDump)))
+ .then(Commands.literal("save-versions")
+ .executes(AdminDebugCommands::saveVersions));
+ }
+
+ private static LiteralArgumentBuilder<CommandSourceStack> indexTarget(String type) {
+ return Commands.literal(type)
+ .then(Commands.argument("chunk", StringArgumentType.greedyString())
+ .executes(context -> index(context, type)));
+ }
+
+ private static int index(CommandContext<CommandSourceStack> context, String type) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ ChunkPos chunk = parseChunk(StringArgumentType.getString(context, "chunk"));
+ int count = switch (type) {
+ case "recruits" -> RecruitIndex.instance().countInChunk(level, chunk, true);
+ case "workers" -> WorkerIndex.instance().countInChunk(level, chunk, true);
+ case "workareas" -> WorkAreaIndex.instance().countInChunk(level, chunk, AbstractWorkAreaEntity.class);
+ default -> throw new IllegalArgumentException("Unknown index type: " + type);
+ };
+ context.getSource().sendSuccess(() -> Component.literal(
+ "Index " + type + " chunk " + chunk.x + "," + chunk.z + ": " + count
+ ), false);
+ return count;
+ }
+
+ private static int pathfindingStats(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ serverLevel(context.getSource());
+ GlobalPathfindingController.ProfilingSnapshot snapshot = GlobalPathfindingController.profilingSnapshot();
+ context.getSource().sendSuccess(() -> Component.literal(
+ "Pathfinding stats: requests=" + snapshot.totalRequests()
+ + " executedBudget=" + snapshot.budgetUsedThisTick() + "/" + snapshot.requestBudgetPerTick()
+ + " deferredQueue=" + snapshot.currentDeferredQueueDepth()
+ + " maxDeferredQueue=" + snapshot.maxDeferredQueueDepth()
+ ), false);
+ return 1;
+ }
+
+ private static int countersDump(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ serverLevel(context.getSource());
+ Map<String, Long> snapshot = RuntimeProfilingCounters.snapshot();
+ if (snapshot.isEmpty()) {
+ context.getSource().sendSuccess(() -> Component.literal("No runtime counters recorded."), false);
+ return 1;
+ }
+ for (Map.Entry<String, Long> entry : snapshot.entrySet()) {
+ context.getSource().sendSuccess(() -> Component.literal(entry.getKey() + "=" + entry.getValue()), false);
+ }
+ return snapshot.size();
+ }
+
+ private static int saveVersions(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ serverLevel(context.getSource());
+ int reported = 0;
+ for (Class<?> savedDataClass : VERSIONED_SAVED_DATA) {
+ Integer version = currentVersion(savedDataClass);
+ if (version == null) {
+ context.getSource().sendSuccess(() -> Component.literal(savedDataClass.getSimpleName() + "=unavailable"), false);
+ continue;
+ }
+ reported++;
+ context.getSource().sendSuccess(() -> Component.literal(savedDataClass.getSimpleName() + "=" + version), false);
+ }
+ return reported;
+ }
+
+ private static Integer currentVersion(Class<?> savedDataClass) {
+ try {
+ Field field = savedDataClass.getDeclaredField("CURRENT_VERSION");
+ field.setAccessible(true);
+ return field.getInt(null);
+ } catch (ReflectiveOperationException | RuntimeException exception) {
+ return null;
+ }
+ }
+
+ private static ChunkPos parseChunk(String value) throws CommandSyntaxException {
+ String[] parts = value.split(",", -1);
+ if (parts.length != 2) {
+ throw INVALID_CHUNK.create();
+ }
+ try {
+ return new ChunkPos(Integer.parseInt(parts[0]), Integer.parseInt(parts[1]));
+ } catch (NumberFormatException exception) {
+ throw INVALID_CHUNK.create();
+ }
+ }
+
+ private static ServerLevel serverLevel(CommandSourceStack source) throws CommandSyntaxException {
+ ServerLevel level = source.getLevel();
+ if (level == null || level.isClientSide()) {
+ throw SERVER_ONLY.create();
+ }
+ return level;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/commands/admin/AdminRecoveryCommands.java b/src/main/java/com/talhanation/bannermod/commands/admin/AdminRecoveryCommands.java
new file mode 100644
index 00000000..046f86ab
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/commands/admin/AdminRecoveryCommands.java
@@ -0,0 +1,212 @@
+package com.talhanation.bannermod.commands.admin;
+
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
+import com.talhanation.bannermod.events.ClaimEvents;
+import com.talhanation.bannermod.governance.BannerModTreasuryLedgerSnapshot;
+import com.talhanation.bannermod.governance.BannerModTreasuryManager;
+import com.talhanation.bannermod.persistence.military.RecruitsClaim;
+import com.talhanation.bannermod.persistence.military.RecruitsPlayerInfo;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import net.minecraft.core.BlockPos;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.phys.AABB;
+
+import java.util.ArrayList;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public final class AdminRecoveryCommands {
+ private static final SimpleCommandExceptionType INVALID_UUID = new SimpleCommandExceptionType(
+ Component.literal("claimUuid must be a valid UUID")
+ );
+ private static final SimpleCommandExceptionType SERVER_ONLY = new SimpleCommandExceptionType(
+ Component.literal("This command can only run on a server")
+ );
+ private static final SimpleCommandExceptionType WORKER_NOT_FOUND = new SimpleCommandExceptionType(
+ Component.literal("entityId must reference a loaded worker")
+ );
+ private static final SimpleCommandExceptionType CHUNK_NOT_LOADED = new SimpleCommandExceptionType(
+ Component.literal("chunk must be loaded")
+ );
+ private static final SimpleCommandExceptionType NO_WORKERS_IN_CHUNK = new SimpleCommandExceptionType(
+ Component.literal("chunk must contain at least one loaded worker")
+ );
+
+ private AdminRecoveryCommands() {
+ }
+
+ public static LiteralArgumentBuilder<CommandSourceStack> settlement() {
+ return Commands.literal("settlement")
+ .requires(source -> source.hasPermission(2))
+ .then(Commands.literal("prune")
+ .then(Commands.argument("claimUuid", StringArgumentType.word())
+ .executes(AdminRecoveryCommands::pruneSettlement)));
+ }
+
+ public static LiteralArgumentBuilder<CommandSourceStack> treasury() {
+ return Commands.literal("treasury")
+ .requires(source -> source.hasPermission(2))
+ .then(Commands.literal("set")
+ .then(Commands.argument("claimUuid", StringArgumentType.word())
+ .then(Commands.argument("amount", IntegerArgumentType.integer(0))
+ .executes(AdminRecoveryCommands::setTreasury))))
+ .then(Commands.literal("show")
+ .then(Commands.argument("claimUuid", StringArgumentType.word())
+ .executes(AdminRecoveryCommands::showTreasury)));
+ }
+
+ public static LiteralArgumentBuilder<CommandSourceStack> claim() {
+ return Commands.literal("claim")
+ .requires(source -> source.hasPermission(2))
+ .then(Commands.literal("trust")
+ .then(Commands.literal("prune-dead-uuids")
+ .executes(AdminRecoveryCommands::pruneDeadTrustedUuids)));
+ }
+
+ public static LiteralArgumentBuilder<CommandSourceStack> worker() {
+ return Commands.literal("worker")
+ .requires(source -> source.hasPermission(2))
+ .then(Commands.literal("unbind")
+ .then(Commands.argument("entityId", IntegerArgumentType.integer(0))
+ .executes(AdminRecoveryCommands::unbindWorker)))
+ .then(Commands.literal("rehome")
+ .then(Commands.argument("chunkX", IntegerArgumentType.integer())
+ .then(Commands.argument("chunkZ", IntegerArgumentType.integer())
+ .executes(AdminRecoveryCommands::rehomeWorkers))));
+ }
+
+ private static int pruneSettlement(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ UUID claimUuid = claimUuid(context);
+ boolean removed = SettlementManager.get(level).removeSnapshot(claimUuid) != null;
+ context.getSource().sendSuccess(() -> Component.literal(
+ removed ? "Pruned settlement snapshot " + claimUuid : "No settlement snapshot found for " + claimUuid
+ ), false);
+ return removed ? 1 : 0;
+ }
+
+ private static int setTreasury(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ UUID claimUuid = claimUuid(context);
+ int amount = IntegerArgumentType.getInteger(context, "amount");
+ BannerModTreasuryManager treasury = BannerModTreasuryManager.get(level);
+ BannerModTreasuryLedgerSnapshot previous = treasury.getLedger(claimUuid);
+ ChunkPos anchor = previous == null ? new ChunkPos(0, 0) : previous.anchorChunk();
+ String settlementFactionId = previous == null ? null : previous.settlementFactionId();
+ treasury.putLedger(new BannerModTreasuryLedgerSnapshot(
+ claimUuid,
+ anchor.x,
+ anchor.z,
+ settlementFactionId,
+ amount,
+ 0,
+ amount,
+ level.getGameTime(),
+ 0,
+ 0L
+ ));
+ context.getSource().sendSuccess(() -> Component.literal("Treasury " + claimUuid + " set to " + amount), false);
+ return 1;
+ }
+
+ private static int showTreasury(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ UUID claimUuid = claimUuid(context);
+ BannerModTreasuryLedgerSnapshot ledger = BannerModTreasuryManager.get(level).getLedger(claimUuid);
+ int amount = ledger == null ? 0 : ledger.treasuryBalance();
+ context.getSource().sendSuccess(() -> Component.literal("Treasury " + claimUuid + " balance: " + amount), false);
+ return 1;
+ }
+
+ private static int pruneDeadTrustedUuids(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ int removed = 0;
+ for (RecruitsClaim claim : ClaimEvents.claimManager().getAllClaims()) {
+ List<RecruitsPlayerInfo> trustedPlayers = claim.getTrustedPlayers();
+ List<RecruitsPlayerInfo> pruned = new ArrayList<>();
+ Set<UUID> seen = new LinkedHashSet<>();
+ for (RecruitsPlayerInfo trustedPlayer : trustedPlayers) {
+ if (trustedPlayer == null || trustedPlayer.getUUID() == null || !seen.add(trustedPlayer.getUUID())) {
+ removed++;
+ continue;
+ }
+ pruned.add(trustedPlayer);
+ }
+ if (pruned.size() != trustedPlayers.size()) {
+ claim.setTrustedPlayers(pruned);
+ ClaimEvents.claimManager().addOrUpdateClaim(level, claim);
+ }
+ }
+ int removedCount = removed;
+ context.getSource().sendSuccess(() -> Component.literal("Pruned " + removedCount + " dead trusted UUID entries"), false);
+ return removed;
+ }
+
+ private static int unbindWorker(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ int entityId = IntegerArgumentType.getInteger(context, "entityId");
+ Entity entity = level.getEntity(entityId);
+ if (!(entity instanceof AbstractWorkerEntity worker)) {
+ throw WORKER_NOT_FOUND.create();
+ }
+ worker.setCurrentWorkArea(null);
+ context.getSource().sendSuccess(() -> Component.literal("Unbound worker " + entityId), false);
+ return 1;
+ }
+
+ private static int rehomeWorkers(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ ServerLevel level = serverLevel(context.getSource());
+ int chunkX = IntegerArgumentType.getInteger(context, "chunkX");
+ int chunkZ = IntegerArgumentType.getInteger(context, "chunkZ");
+ if (!level.hasChunk(chunkX, chunkZ)) {
+ throw CHUNK_NOT_LOADED.create();
+ }
+
+ ChunkPos chunk = new ChunkPos(chunkX, chunkZ);
+ BlockPos home = new BlockPos(chunk.getMiddleBlockX(), level.getSeaLevel(), chunk.getMiddleBlockZ());
+ AABB chunkBounds = new AABB(
+ chunk.getMinBlockX(), level.getMinBuildHeight(), chunk.getMinBlockZ(),
+ chunk.getMaxBlockX() + 1, level.getMaxBuildHeight(), chunk.getMaxBlockZ() + 1
+ );
+ List<AbstractWorkerEntity> workers = level.getEntitiesOfClass(AbstractWorkerEntity.class, chunkBounds);
+ if (workers.isEmpty()) {
+ throw NO_WORKERS_IN_CHUNK.create();
+ }
+ for (AbstractWorkerEntity worker : workers) {
+ worker.setHomePos(home);
+ worker.setHomeBuildAreaUUID(null);
+ }
+ int count = workers.size();
+ context.getSource().sendSuccess(() -> Component.literal("Rehomed " + count + " worker(s) to chunk " + chunkX + "," + chunkZ), false);
+ return count;
+ }
+
+ private static UUID claimUuid(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+ try {
+ return UUID.fromString(StringArgumentType.getString(context, "claimUuid"));
+ } catch (IllegalArgumentException exception) {
+ throw INVALID_UUID.create();
+ }
+ }
+
+ private static ServerLevel serverLevel(CommandSourceStack source) throws CommandSyntaxException {
+ ServerLevel level = source.getLevel();
+ if (level == null || level.isClientSide()) {
+ throw SERVER_ONLY.create();
+ }
+ return level;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/commands/military/UnitsManagerAdminCommands.java b/src/main/java/com/talhanation/bannermod/commands/military/UnitsManagerAdminCommands.java
index 2134144b..a3fec108 100644
--- a/src/main/java/com/talhanation/bannermod/commands/military/UnitsManagerAdminCommands.java
+++ b/src/main/java/com/talhanation/bannermod/commands/military/UnitsManagerAdminCommands.java
@@ -5,7 +5,7 @@
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.talhanation.bannermod.config.RecruitsServerConfig;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import net.minecraft.ChatFormatting;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
diff --git a/src/main/java/com/talhanation/bannermod/commands/war/BannerModWarCommands.java b/src/main/java/com/talhanation/bannermod/commands/war/BannerModWarCommands.java
index 76acc638..b34f8788 100644
--- a/src/main/java/com/talhanation/bannermod/commands/war/BannerModWarCommands.java
+++ b/src/main/java/com/talhanation/bannermod/commands/war/BannerModWarCommands.java
@@ -2,6 +2,8 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.talhanation.bannermod.commands.admin.AdminDebugCommands;
+import com.talhanation.bannermod.commands.admin.AdminRecoveryCommands;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
@@ -15,6 +17,11 @@ public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
private static LiteralArgumentBuilder<CommandSourceStack> root() {
return Commands.literal("bannermod")
+ .then(AdminDebugCommands.debug())
+ .then(AdminRecoveryCommands.settlement())
+ .then(AdminRecoveryCommands.treasury())
+ .then(AdminRecoveryCommands.claim())
+ .then(AdminRecoveryCommands.worker())
.then(PoliticalRegistryCommands.build())
.then(WarDeclarationCommands.build()
.then(SiegeStandardCommands.build())
diff --git a/src/main/java/com/talhanation/bannermod/commands/war/PoliticalRegistryCommands.java b/src/main/java/com/talhanation/bannermod/commands/war/PoliticalRegistryCommands.java
index 668227e0..dc3fba98 100644
--- a/src/main/java/com/talhanation/bannermod/commands/war/PoliticalRegistryCommands.java
+++ b/src/main/java/com/talhanation/bannermod/commands/war/PoliticalRegistryCommands.java
@@ -10,8 +10,8 @@
import com.talhanation.bannermod.war.cooldown.WarCooldownRuntime;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
import com.talhanation.bannermod.persistence.military.RecruitsClaimSaveData;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.war.registry.PoliticalEntityRecord;
import com.talhanation.bannermod.war.registry.PoliticalEntityStatus;
import com.talhanation.bannermod.war.registry.PoliticalRegistryRuntime;
@@ -169,14 +169,14 @@ private static int setStatus(com.mojang.brigadier.context.CommandContext<Command
return 1;
}
- private static Optional<BannerModSettlementSnapshot> settlementSnapshotForEntity(
+ private static Optional<SettlementSnapshot> settlementSnapshotForEntity(
com.mojang.brigadier.context.CommandContext<CommandSourceStack> context,
UUID politicalEntityId) {
var level = WarCommandSupport.level(context);
- BannerModSettlementManager settlements = BannerModSettlementManager.get(level);
+ SettlementManager settlements = SettlementManager.get(level);
for (RecruitsClaim claim : RecruitsClaimSaveData.get(level).getAllClaims()) {
if (politicalEntityId.equals(claim.getOwnerPoliticalEntityId())) {
- BannerModSettlementSnapshot snapshot = settlements.getSnapshot(claim.getUUID());
+ SettlementSnapshot snapshot = settlements.getSnapshot(claim.getUUID());
if (snapshot != null) {
return Optional.of(snapshot);
}
diff --git a/src/main/java/com/talhanation/bannermod/commands/war/WarDeclarationCommands.java b/src/main/java/com/talhanation/bannermod/commands/war/WarDeclarationCommands.java
index 57031ca6..3ec4089f 100644
--- a/src/main/java/com/talhanation/bannermod/commands/war/WarDeclarationCommands.java
+++ b/src/main/java/com/talhanation/bannermod/commands/war/WarDeclarationCommands.java
@@ -5,6 +5,7 @@
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import com.talhanation.bannermod.events.ClaimEvents;
@@ -38,6 +39,13 @@
import java.util.concurrent.CompletableFuture;
public final class WarDeclarationCommands {
+ private static final SimpleCommandExceptionType ERR_INVALID_WAR_ID = new SimpleCommandExceptionType(
+ Component.literal("warId must be a valid UUID")
+ );
+ private static final SimpleCommandExceptionType ERR_SERVER_ONLY = new SimpleCommandExceptionType(
+ Component.literal("This command can only run on a server")
+ );
+
private WarDeclarationCommands() {
}
@@ -62,6 +70,10 @@ public static LiteralArgumentBuilder<CommandSourceStack> build() {
.then(Commands.literal("cancel")
.then(Commands.argument("warId", StringArgumentType.word())
.executes(ctx -> resolve(ctx, ResolveMode.CANCEL, 0L))))
+ .then(Commands.literal("wipe")
+ .requires(source -> source.hasPermission(2))
+ .then(Commands.argument("warId", StringArgumentType.word())
+ .executes(WarDeclarationCommands::wipe)))
.then(Commands.literal("whitepeace")
.requires(source -> source.hasPermission(2))
.then(Commands.argument("warId", StringArgumentType.word())
@@ -209,6 +221,39 @@ private static int resolve(com.mojang.brigadier.context.CommandContext<CommandSo
return finalizeOutcome(context, level, war, mode, result);
}
+ private static int wipe(com.mojang.brigadier.context.CommandContext<CommandSourceStack> context)
+ throws CommandSyntaxException {
+ UUID warId = parseWarId(StringArgumentType.getString(context, "warId"));
+ ServerLevel level = context.getSource().getLevel();
+ if (level == null || level.isClientSide()) {
+ throw ERR_SERVER_ONLY.create();
+ }
+ WarDeclarationRuntime declarations = WarRuntimeContext.declarations(level);
+ if (declarations.byId(warId).isEmpty()) {
+ throw WarCommandSupport.ERR_WAR_NOT_FOUND.create();
+ }
+
+ int removedSieges = 0;
+ for (var siege : WarRuntimeContext.sieges(level).forWar(warId)) {
+ if (WarRuntimeContext.sieges(level).remove(siege.id())) {
+ removedSieges++;
+ }
+ }
+ int removedInvites = WarRuntimeContext.allyInvites(level).removeForWar(warId);
+ declarations.remove(warId);
+ WarCommandSupport.reply(context, "Wiped war " + warId
+ + " (siege standards=" + removedSieges + ", ally invites=" + removedInvites + ")");
+ return 1;
+ }
+
+ private static UUID parseWarId(String token) throws CommandSyntaxException {
+ try {
+ return UUID.fromString(token);
+ } catch (IllegalArgumentException exception) {
+ throw ERR_INVALID_WAR_ID.create();
+ }
+ }
+
private static int vassalize(com.mojang.brigadier.context.CommandContext<CommandSourceStack> context)
throws CommandSyntaxException {
String token = StringArgumentType.getString(context, "warId");
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/AnimalFarmerEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/AnimalFarmerEntity.java
index 0c51acf4..8eb43a16 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/AnimalFarmerEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/AnimalFarmerEntity.java
@@ -3,7 +3,6 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.AnimalFarmerWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.AnimalPenArea;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -33,12 +32,6 @@ public AnimalFarmerEntity(EntityType<? extends AbstractWorkerEntity> entityType,
super(entityType, world);
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(0, new AnimalFarmerWorkGoal(this));
- }
-
public static AttributeSupplier.Builder setAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 40.0D)
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/BuilderEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/BuilderEntity.java
index 4ef04f88..4aa5f60c 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/BuilderEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/BuilderEntity.java
@@ -3,7 +3,6 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.BuilderWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.BuildArea;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -34,12 +33,6 @@ public BuilderEntity(EntityType<? extends AbstractWorkerEntity> entityType, Leve
super(entityType, world);
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(0, new BuilderWorkGoal(this));
- }
-
public static AttributeSupplier.Builder setAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 40.0D)
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/FarmerEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/FarmerEntity.java
index 6cdefdc7..abac1b4b 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/FarmerEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/FarmerEntity.java
@@ -4,7 +4,6 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.FarmerWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.CropArea;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -44,12 +43,6 @@ public FarmerEntity(EntityType<? extends AbstractWorkerEntity> entityType, Level
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(0, new FarmerWorkGoal(this));
- }
-
public static AttributeSupplier.Builder setAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 20.0D)
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/FishermanEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/FishermanEntity.java
index c9c72371..a4ba28c9 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/FishermanEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/FishermanEntity.java
@@ -3,13 +3,15 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.FishermanWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.FishingArea;
+import net.minecraft.server.MinecraftServer;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource;
+import net.minecraft.world.InteractionHand;
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.Mob;
@@ -19,8 +21,14 @@
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.item.*;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.ServerLevelAccessor;
+import net.minecraft.world.level.storage.loot.BuiltInLootTables;
+import net.minecraft.world.level.storage.loot.LootParams;
+import net.minecraft.world.level.storage.loot.LootTable;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.Vec3;
import net.neoforged.neoforge.common.NeoForgeMod;
import net.minecraft.core.registries.BuiltInRegistries;
@@ -34,12 +42,6 @@ public FishermanEntity(EntityType<? extends AbstractWorkerEntity> entityType, Le
super(entityType, world);
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(0, new FishermanWorkGoal(this));
- }
-
public static AttributeSupplier.Builder setAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 20.0D)
@@ -136,4 +138,29 @@ public FishingBobberEntity throwFishingHook(Vec3 target){
return fishingBobber;
}
+
+ public void spawnFishingLoot(FishingBobberEntity fishingBobber) {
+ if(fishingBobber == null ) return;
+
+ ServerLevel serverLevel = (ServerLevel)this.getCommandSenderWorld();
+ double luckFromTool = EnchantmentHelper.getFishingLuckBonus(serverLevel, this.getItemInHand(InteractionHand.MAIN_HAND), this);
+ double luckFromDepth = Math.min(25, fishingBobber.getWaterDepth())/10F;
+ double luck = 0.1D + luckFromTool + luckFromDepth;
+
+ LootParams lootparams = (new LootParams.Builder(serverLevel))
+ .withParameter(LootContextParams.ORIGIN, this.position())
+ .withParameter(LootContextParams.TOOL, getMainHandItem())
+ .withParameter(LootContextParams.ATTACKING_ENTITY, this)
+ .withLuck((float)(luck + luckFromTool))
+ .create(LootContextParamSets.FISHING);
+ LootTable loottable = this.getCommandSenderWorld().getServer().reloadableRegistries().getLootTable(BuiltInLootTables.FISHING);
+ List<ItemStack> list = loottable.getRandomItems(lootparams);
+
+ MinecraftServer server = getServer();
+ if (server == null) return;
+
+ for (ItemStack itemstack : list) {
+ getInventory().addItem(itemstack);
+ }
+ }
}
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/LumberjackEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/LumberjackEntity.java
index 97032295..b665c145 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/LumberjackEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/LumberjackEntity.java
@@ -3,7 +3,6 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.LumberjackWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.LumberArea;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -34,12 +33,6 @@ public LumberjackEntity(EntityType<? extends AbstractWorkerEntity> entityType, L
super(entityType, world);
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(0, new LumberjackWorkGoal(this));
- }
-
public static AttributeSupplier.Builder setAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 20.0D)
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/MerchantEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/MerchantEntity.java
index d35a16b9..33ccbbc3 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/MerchantEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/MerchantEntity.java
@@ -5,7 +5,6 @@
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.MerchantWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.MarketArea;
import com.talhanation.bannermod.events.ClaimEvents;
import com.talhanation.bannermod.governance.BannerModGovernorManager;
@@ -14,8 +13,8 @@
import com.talhanation.bannermod.network.messages.civilian.MessageOpenMerchantEditTradeScreen;
import com.talhanation.bannermod.network.messages.civilian.MessageOpenMerchantTradeScreen;
import com.talhanation.bannermod.persistence.civilian.WorkersMerchantTrade;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementService;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.network.syncher.EntityDataAccessor;
@@ -113,12 +112,6 @@ public List<Item> inventoryInputHelp() {
return null;
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(3, new MerchantWorkGoal(this));
- }
-
@Nullable
public MarketArea getCurrentMarketArea() {
return getCurrentWorkArea() instanceof MarketArea ma ? ma : null;
@@ -550,10 +543,10 @@ private void refreshSettlementSnapshot() {
if (!(this.level() instanceof ServerLevel serverLevel) || market == null || ClaimEvents.claimManager() == null) {
return;
}
- BannerModSettlementService.refreshClaimAt(
+ SettlementService.refreshClaimAt(
serverLevel,
ClaimEvents.claimManager(),
- BannerModSettlementManager.get(serverLevel),
+ SettlementManager.get(serverLevel),
BannerModGovernorManager.get(serverLevel),
market.blockPosition()
);
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/MinerEntity.java b/src/main/java/com/talhanation/bannermod/entity/civilian/MinerEntity.java
index 99d6e10c..3c4c4f59 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/MinerEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/MinerEntity.java
@@ -3,7 +3,6 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.ai.pathfinding.AsyncGroundPathNavigation;
import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.ai.civilian.MinerWorkGoal;
import com.talhanation.bannermod.entity.civilian.workarea.MiningArea;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
@@ -36,12 +35,6 @@ public MinerEntity(EntityType<? extends AbstractWorkerEntity> entityType, Level
super(entityType, world);
}
- @Override
- protected void registerGoals() {
- super.registerGoals();
- this.goalSelector.addGoal(0, new MinerWorkGoal(this));
- }
-
public static AttributeSupplier.Builder setAttributes() {
return Mob.createMobAttributes()
.add(Attributes.MAX_HEALTH, 40.0D)
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerControlAccess.java b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerControlAccess.java
index cf34b9e4..8b04bd9f 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerControlAccess.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerControlAccess.java
@@ -2,8 +2,8 @@
import com.talhanation.bannermod.events.ClaimEvents;
import com.talhanation.bannermod.governance.BannerModGovernorManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementService;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.player.Player;
@@ -65,10 +65,10 @@ private void refreshSettlementSnapshot() {
if (!(this.worker.level() instanceof ServerLevel serverLevel) || ClaimEvents.claimManager() == null) {
return;
}
- BannerModSettlementService.refreshClaimAt(
+ SettlementService.refreshClaimAt(
serverLevel,
ClaimEvents.claimManager(),
- BannerModSettlementManager.get(serverLevel),
+ SettlementManager.get(serverLevel),
BannerModGovernorManager.get(serverLevel),
this.worker.blockPosition()
);
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerDismissService.java b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerDismissService.java
new file mode 100644
index 00000000..c55973b9
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerDismissService.java
@@ -0,0 +1,41 @@
+package com.talhanation.bannermod.entity.civilian;
+
+import com.talhanation.bannermod.shared.settlement.BannerModSettlementRefreshSupport;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+
+import javax.annotation.Nullable;
+
+public final class WorkerDismissService {
+ private WorkerDismissService() {
+ }
+
+ @Nullable
+ public static String dismissDeniedReasonKey(@Nullable ServerPlayer player, @Nullable AbstractWorkerEntity worker) {
+ if (player == null || worker == null || !(worker.level() instanceof ServerLevel)) {
+ return "chat.bannermod.workerui.dismiss.denied.missing";
+ }
+ if (!worker.isAlive() || worker.isRemoved()) {
+ return "chat.bannermod.workerui.dismiss.denied.dead";
+ }
+ if (player.distanceToSqr(worker) > 16.0D * 16.0D) {
+ return "chat.bannermod.workerui.dismiss.denied.too_far";
+ }
+ if (player.getUUID().equals(worker.getOwnerUUID()) || player.hasPermissions(2)) {
+ return null;
+ }
+ return "chat.bannermod.workerui.dismiss.denied.not_owner";
+ }
+
+ public static boolean dismiss(@Nullable ServerPlayer player, @Nullable AbstractWorkerEntity worker) {
+ if (dismissDeniedReasonKey(player, worker) != null || worker == null || !(worker.level() instanceof ServerLevel serverLevel)) {
+ return false;
+ }
+ if (worker.getCurrentWorkArea() != null) {
+ worker.getCurrentWorkArea().setBeingWorkedOn(false);
+ }
+ worker.discard();
+ BannerModSettlementRefreshSupport.refreshSnapshot(serverLevel, worker.blockPosition());
+ return true;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerIndex.java b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerIndex.java
index f5e0d058..723bcd87 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerIndex.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerIndex.java
@@ -114,6 +114,23 @@ public Optional<List<AbstractWorkerEntity>> queryInClaim(ServerLevel level, Recr
return Optional.of(List.copyOf(workers));
}
+ public int countInChunk(ServerLevel level, ChunkPos chunkPos, boolean aliveOnly) {
+ if (level == null || chunkPos == null) return 0;
+ Map<ChunkPos, Set<UUID>> chunks = byLevel.get(level.dimension());
+ if (chunks == null) return 0;
+ Set<UUID> uuids = chunks.get(chunkPos);
+ if (uuids == null || uuids.isEmpty()) return 0;
+ if (!aliveOnly) return uuids.size();
+ int count = 0;
+ for (UUID uuid : uuids) {
+ Entity entity = level.getEntity(uuid);
+ if (entity instanceof AbstractWorkerEntity worker && worker.isAlive()) {
+ count++;
+ }
+ }
+ return count;
+ }
+
public void clear(ResourceKey<Level> dimension) {
if (dimension == null) return;
byLevel.remove(dimension);
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerRuntimeLoop.java b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerRuntimeLoop.java
index 172f4c72..1e5200b5 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerRuntimeLoop.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/WorkerRuntimeLoop.java
@@ -2,6 +2,7 @@
import com.talhanation.bannermod.util.RuntimeProfilingCounters;
import com.talhanation.bannermod.entity.civilian.workarea.AbstractWorkAreaEntity;
+import net.minecraft.network.chat.Component;
import net.minecraft.world.entity.item.ItemEntity;
import java.util.List;
@@ -15,6 +16,7 @@ private WorkerRuntimeLoop() {
static void aiStep(AbstractWorkerEntity worker) {
tickLootPickup(worker);
releaseDistantWorkArea(worker);
+ reportMissingWorkArea(worker);
}
private static void tickLootPickup(AbstractWorkerEntity worker) {
@@ -57,4 +59,20 @@ private static void releaseDistantWorkArea(AbstractWorkerEntity worker) {
workArea.setBeingWorkedOn(false);
}
}
+
+ private static void reportMissingWorkArea(AbstractWorkerEntity worker) {
+ if (!worker.shouldWork() || worker.getCurrentWorkArea() != null) {
+ return;
+ }
+
+ if (worker instanceof FarmerEntity) {
+ worker.reportIdleReason("farmer_no_area", Component.literal(worker.getName().getString() + ": Waiting for a crop area."));
+ } else if (worker instanceof MinerEntity) {
+ worker.reportIdleReason("miner_no_area", Component.literal(worker.getName().getString() + ": Waiting for a mining area."));
+ } else if (worker instanceof LumberjackEntity) {
+ worker.reportIdleReason("lumberjack_no_area", Component.literal(worker.getName().getString() + ": Waiting for a lumber area."));
+ } else if (worker instanceof BuilderEntity) {
+ worker.reportIdleReason("builder_no_area", Component.literal(worker.getName().getString() + ": Waiting for a build area."));
+ }
+ }
}
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/BuildArea.java b/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/BuildArea.java
index 6c559e91..fb18d260 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/BuildArea.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/BuildArea.java
@@ -8,7 +8,7 @@
import com.talhanation.bannermod.persistence.civilian.BuildBlockParse;
import com.talhanation.bannermod.persistence.civilian.StructureManager;
import com.talhanation.bannermod.settlement.prefab.staffing.PrefabAutoStaffingRuntime;
-import com.talhanation.bannermod.settlement.project.BannerModSettlementProjectRuntime;
+import com.talhanation.bannermod.settlement.project.SettlementProjectRuntime;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementRefreshSupport;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -150,7 +150,7 @@ public void setStartBuild(boolean isCreative) {
this.resumePlanPending = false;
this.setDone(false);
if (this.getCommandSenderWorld() instanceof ServerLevel serverLevel) {
- BannerModSettlementProjectRuntime.onBuildAreaStarted(serverLevel, this.getUUID());
+ SettlementProjectRuntime.onBuildAreaStarted(serverLevel, this.getUUID());
}
stackToPlace.clear();
stackToBreak.clear();
@@ -213,7 +213,7 @@ public void setDone(boolean done) {
boolean wasDone = this.isDone();
super.setDone(done);
if (done && !wasDone && this.getCommandSenderWorld() instanceof ServerLevel serverLevel) {
- BannerModSettlementProjectRuntime.onBuildAreaCompleted(serverLevel, this.getUUID());
+ SettlementProjectRuntime.onBuildAreaCompleted(serverLevel, this.getUUID());
}
}
diff --git a/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/WorkAreaIndex.java b/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/WorkAreaIndex.java
index b48bfcad..56cc855b 100644
--- a/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/WorkAreaIndex.java
+++ b/src/main/java/com/talhanation/bannermod/entity/civilian/workarea/WorkAreaIndex.java
@@ -167,6 +167,22 @@ public <T extends AbstractWorkAreaEntity> List<T> queryInChunks(ServerLevel leve
return results;
}
+ public int countInChunk(ServerLevel level, ChunkPos chunkPos, Class<? extends AbstractWorkAreaEntity> type) {
+ if (level == null || chunkPos == null || type == null) return 0;
+ Map<ChunkPos, Set<UUID>> chunks = byLevel.get(level.dimension());
+ if (chunks == null) return 0;
+ Set<UUID> uuids = chunks.get(chunkPos);
+ if (uuids == null || uuids.isEmpty()) return 0;
+ int count = 0;
+ for (UUID uuid : uuids) {
+ Entity entity = level.getEntity(uuid);
+ if (type.isInstance(entity) && entity.isAlive()) {
+ count++;
+ }
+ }
+ return count;
+ }
+
/** Total entries tracked in a given level (diagnostics only). */
public int sizeFor(ResourceKey<Level> dimension) {
Map<ChunkPos, Set<UUID>> chunks = byLevel.get(dimension);
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/AbstractRecruitEntity.java b/src/main/java/com/talhanation/bannermod/entity/military/AbstractRecruitEntity.java
index 2d97d96a..c1358f04 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/AbstractRecruitEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/AbstractRecruitEntity.java
@@ -6,8 +6,9 @@
import com.talhanation.bannermod.citizen.CitizenPersistenceBridge;
import com.talhanation.bannermod.citizen.CitizenRole;
import com.talhanation.bannermod.entity.citizen.AbstractCitizenEntity;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.events.*;
-import com.talhanation.bannermod.events.RecruitEvent;
+import com.talhanation.bannermod.api.event.RecruitEvent;
import com.talhanation.bannermod.compat.IWeapon;
import com.talhanation.bannermod.config.RecruitsClientConfig;
import com.talhanation.bannermod.config.RecruitsServerConfig;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderCountAuthority.java b/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderCountAuthority.java
new file mode 100644
index 00000000..8f959d0c
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderCountAuthority.java
@@ -0,0 +1,18 @@
+package com.talhanation.bannermod.entity.military;
+
+import java.util.UUID;
+import java.util.function.IntConsumer;
+
+public final class AssassinLeaderCountAuthority {
+ private AssassinLeaderCountAuthority() {
+ }
+
+ public static boolean trySetCount(UUID controlOwnerUUID, UUID senderUUID, boolean senderHasOpPermission,
+ int count, IntConsumer countSetter) {
+ if ((controlOwnerUUID != null && controlOwnerUUID.equals(senderUUID)) || senderHasOpPermission) {
+ countSetter.accept(count);
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderEntity.java b/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderEntity.java
index bf14e3a2..871e1d86 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/AssassinLeaderEntity.java
@@ -193,6 +193,11 @@ public boolean isControlledBy(Player player) {
return this.controlOwnerUUID != null && this.controlOwnerUUID.equals(player.getUUID());
}
+ public boolean trySetCountFrom(UUID senderUUID, boolean senderHasOpPermission, int count) {
+ return AssassinLeaderCountAuthority.trySetCount(this.controlOwnerUUID, senderUUID, senderHasOpPermission,
+ count, this::setCount);
+ }
+
@Nullable
public UUID getControlOwnerUUID() {
return controlOwnerUUID;
@@ -216,5 +221,3 @@ public int getMaxAssassinCount(){
-
-
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatDecisions.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatDecisions.java
index 9062c1ce..5ff31344 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatDecisions.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatDecisions.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.ai.military.UnitTypeMatchup;
import com.talhanation.bannermod.ai.military.WeaponReach;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatOverrideService.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatOverrideService.java
index c80664ef..71692f42 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatOverrideService.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitCombatOverrideService.java
@@ -10,7 +10,7 @@
import com.talhanation.bannermod.ai.military.ShieldBlockGeometry;
import com.talhanation.bannermod.ai.military.ShieldMitigation;
import com.talhanation.bannermod.combat.FormationPlanner;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.tags.DamageTypeTags;
import net.minecraft.util.Mth;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitIndex.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitIndex.java
index 0c91d34c..f70b7085 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitIndex.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitIndex.java
@@ -318,6 +318,23 @@ public long version(ServerLevel level) {
return version == null ? 0L : version.get();
}
+ public int countInChunk(ServerLevel level, ChunkPos chunkPos, boolean aliveOnly) {
+ if (level == null || chunkPos == null) return 0;
+ LevelIndex index = byLevel.get(level.dimension());
+ if (index == null) return 0;
+ Set<UUID> uuids = index.byChunk.get(chunkPos);
+ if (uuids == null || uuids.isEmpty()) return 0;
+ if (!aliveOnly) return uuids.size();
+ int count = 0;
+ for (UUID uuid : uuids) {
+ Entity entity = level.getEntity(uuid);
+ if (entity instanceof AbstractRecruitEntity recruit && recruit.isAlive()) {
+ count++;
+ }
+ }
+ return count;
+ }
+
public void resetCounters() {
counters.reset();
}
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitInteractionService.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitInteractionService.java
index 275edbda..0a1da02a 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitInteractionService.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitInteractionService.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.events.CommandEvents;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.inventory.military.DebugInvMenu;
import com.talhanation.bannermod.inventory.military.RecruitHireMenu;
import com.talhanation.bannermod.inventory.military.RecruitInventoryMenu;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitLifecycleService.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitLifecycleService.java
index 84cd1fb1..bef9c6c3 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitLifecycleService.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitLifecycleService.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.entity.military;
-import com.talhanation.bannermod.events.RecruitEvent;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.api.event.RecruitEvent;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitPersistenceBridge.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitPersistenceBridge.java
index 218f4c6e..0851861a 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitPersistenceBridge.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitPersistenceBridge.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.entity.military;
import com.talhanation.bannermod.citizen.CitizenRole;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/RecruitProgressionService.java b/src/main/java/com/talhanation/bannermod/entity/military/RecruitProgressionService.java
index a0997d0c..2d8a751c 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/RecruitProgressionService.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/RecruitProgressionService.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.config.RecruitsServerConfig;
-import com.talhanation.bannermod.events.RecruitEvent;
+import com.talhanation.bannermod.api.event.RecruitEvent;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/VillagerNobleEntity.java b/src/main/java/com/talhanation/bannermod/entity/military/VillagerNobleEntity.java
index 4320929e..1519e3ea 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/VillagerNobleEntity.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/VillagerNobleEntity.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.config.RecruitsServerConfig;
import com.talhanation.bannermod.ai.military.UseShield;
import com.talhanation.bannermod.network.messages.military.MessageToClientOpenNobleTradeScreen;
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkProgress.java b/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkProgress.java
index bd0a359e..e3efc043 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkProgress.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkProgress.java
@@ -4,6 +4,8 @@
import net.minecraft.nbt.ListTag;
import net.minecraft.nbt.StringTag;
import net.minecraft.nbt.Tag;
+import net.minecraft.core.HolderLookup;
+import net.neoforged.neoforge.common.util.INBTSerializable;
import java.util.Collections;
import java.util.LinkedHashSet;
@@ -26,7 +28,7 @@
* touched.</li>
* </ul>
*/
-public final class PerkProgress {
+public final class PerkProgress implements INBTSerializable<CompoundTag> {
private static final String NBT_POINTS = "AvailablePoints";
private static final String NBT_OWNED = "OwnedPerks";
@@ -103,6 +105,11 @@ public CompoundTag toNbt() {
return tag;
}
+ @Override
+ public CompoundTag serializeNBT(HolderLookup.Provider provider) {
+ return toNbt();
+ }
+
public void fromNbt(CompoundTag tag) {
owned.clear();
availablePoints = 0;
@@ -120,4 +127,9 @@ public void fromNbt(CompoundTag tag) {
}
}
}
+
+ @Override
+ public void deserializeNBT(HolderLookup.Provider provider, CompoundTag nbt) {
+ fromNbt(nbt);
+ }
}
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkRegistry.java b/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkRegistry.java
index c4fcd03c..2bcae89c 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkRegistry.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkRegistry.java
@@ -9,10 +9,7 @@
import java.util.Optional;
/**
- * In-memory perk catalog. Phase 1 (SKILLTREE-002) seeds a tiny placeholder set
- * so persistence + skill-point grant can be exercised end-to-end; SKILLTREE-003
- * authors the per-archetype catalogs and SKILLTREE-004 adds the player-facing
- * general-stat tree on top of the same lookup API.
+ * Server-owned in-memory perk catalog populated from datapack JSON during reload.
*
* <p>Server-authoritative: every {@link PerkNode} lives in the JVM, never on
* the wire. Identifiers are deliberately stable strings so save data written
@@ -23,28 +20,30 @@ public final class PerkRegistry {
private static final Map<PerkArchetype, List<PerkNode>> BY_ARCHETYPE = new EnumMap<>(PerkArchetype.class);
static {
- for (PerkArchetype archetype : PerkArchetype.values()) {
- BY_ARCHETYPE.put(archetype, new ArrayList<>());
- }
- seedPlaceholderCatalog();
+ replaceAll(defaultNodes());
}
private PerkRegistry() {
}
- /**
- * Registers a perk; later phases call this from their catalog initializers.
- * Idempotent on identical re-registration to keep gametest reload safe;
- * conflicting redefinitions throw so author errors surface immediately.
- */
- public static synchronized void register(PerkNode node) {
- PerkNode existing = BY_ID.get(node.id());
- if (existing != null) {
- if (existing.equals(node)) return;
- throw new IllegalStateException("Perk id already registered with different payload: " + node.id());
+ public static synchronized void replaceAll(List<PerkNode> nodes) {
+ Map<String, PerkNode> byId = new HashMap<>();
+ Map<PerkArchetype, List<PerkNode>> byArchetype = new EnumMap<>(PerkArchetype.class);
+ for (PerkArchetype archetype : PerkArchetype.values()) {
+ byArchetype.put(archetype, new ArrayList<>());
}
- BY_ID.put(node.id(), node);
- BY_ARCHETYPE.get(node.archetype()).add(node);
+ for (PerkNode node : nodes) {
+ PerkNode existing = byId.putIfAbsent(node.id(), node);
+ if (existing != null) {
+ throw new IllegalStateException("Duplicate perk id: " + node.id());
+ }
+ byArchetype.get(node.archetype()).add(node);
+ }
+
+ BY_ID.clear();
+ BY_ID.putAll(byId);
+ BY_ARCHETYPE.clear();
+ BY_ARCHETYPE.putAll(byArchetype);
}
public static Optional<PerkNode> get(String id) {
@@ -63,28 +62,21 @@ public static boolean isKnown(String id) {
return BY_ID.containsKey(id);
}
- /**
- * Seeds one placeholder perk per archetype + one universal perk so the
- * registry is non-empty and downstream tests have observable ids to query.
- * Catalog authoring proper happens in SKILLTREE-003/004.
- */
- private static void seedPlaceholderCatalog() {
- registerInternal(PerkNode.leaf("universal/toughness_i", PerkArchetype.UNIVERSAL, 1,
- new PerkBonus(PerkStat.MAX_HEALTH, 2.0D)));
- registerInternal(PerkNode.leaf("swordsman/iron_grip_i", PerkArchetype.SWORDSMAN, 1,
- new PerkBonus(PerkStat.ATTACK_DAMAGE, 0.5D)));
- registerInternal(PerkNode.leaf("bowman/steady_aim_i", PerkArchetype.BOWMAN, 1,
- new PerkBonus(PerkStat.RANGED_ACCURACY, 0.05D)));
- registerInternal(PerkNode.leaf("crossbowman/heavy_bolts_i", PerkArchetype.CROSSBOWMAN, 1,
- new PerkBonus(PerkStat.RANGED_VELOCITY, 0.1D)));
- registerInternal(PerkNode.leaf("pikeman/braced_stance_i", PerkArchetype.PIKEMAN, 1,
- new PerkBonus(PerkStat.KNOCKBACK_RESIST, 0.1D)));
- registerInternal(PerkNode.leaf("cavalry/swift_charge_i", PerkArchetype.CAVALRY, 1,
- new PerkBonus(PerkStat.MOVEMENT_SPEED, 0.01D)));
+ private static List<PerkNode> defaultNodes() {
+ return List.of(
+ PerkNode.leaf("universal/toughness_i", PerkArchetype.UNIVERSAL, 1,
+ new PerkBonus(PerkStat.MAX_HEALTH, 2.0D)),
+ PerkNode.leaf("swordsman/iron_grip_i", PerkArchetype.SWORDSMAN, 1,
+ new PerkBonus(PerkStat.ATTACK_DAMAGE, 0.5D)),
+ PerkNode.leaf("bowman/steady_aim_i", PerkArchetype.BOWMAN, 1,
+ new PerkBonus(PerkStat.RANGED_ACCURACY, 0.05D)),
+ PerkNode.leaf("crossbowman/heavy_bolts_i", PerkArchetype.CROSSBOWMAN, 1,
+ new PerkBonus(PerkStat.RANGED_VELOCITY, 0.1D)),
+ PerkNode.leaf("pikeman/braced_stance_i", PerkArchetype.PIKEMAN, 1,
+ new PerkBonus(PerkStat.KNOCKBACK_RESIST, 0.1D)),
+ PerkNode.leaf("cavalry/swift_charge_i", PerkArchetype.CAVALRY, 1,
+ new PerkBonus(PerkStat.MOVEMENT_SPEED, 0.01D))
+ );
}
- private static void registerInternal(PerkNode node) {
- BY_ID.put(node.id(), node);
- BY_ARCHETYPE.get(node.archetype()).add(node);
- }
}
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkReloadListener.java b/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkReloadListener.java
new file mode 100644
index 00000000..2fb83fe2
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/entity/military/perks/PerkReloadListener.java
@@ -0,0 +1,126 @@
+package com.talhanation.bannermod.entity.military.perks;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.talhanation.bannermod.bootstrap.BannerModMain;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.packs.resources.ResourceManager;
+import net.minecraft.server.packs.resources.SimpleJsonResourceReloadListener;
+import net.minecraft.util.profiling.ProfilerFiller;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public final class PerkReloadListener extends SimpleJsonResourceReloadListener {
+ private static final Gson GSON = new Gson();
+
+ public PerkReloadListener() {
+ super(GSON, "perks");
+ }
+
+ @Override
+ protected void apply(Map<ResourceLocation, JsonElement> jsons, ResourceManager resourceManager, ProfilerFiller profiler) {
+ List<PerkNode> nodes = new ArrayList<>();
+ Set<String> ids = new HashSet<>();
+ for (Map.Entry<ResourceLocation, JsonElement> entry : jsons.entrySet()) {
+ PerkNode node = parse(entry.getKey(), entry.getValue());
+ if (!ids.add(node.id())) {
+ throw new IllegalStateException("Duplicate perk id in datapack JSON: " + node.id());
+ }
+ nodes.add(node);
+ }
+
+ PerkRegistry.replaceAll(nodes);
+ BannerModMain.LOGGER.info("Loaded {} perks from datapacks", nodes.size());
+ }
+
+ private static PerkNode parse(ResourceLocation source, JsonElement json) {
+ if (!json.isJsonObject()) {
+ throw new JsonParseException("Perk " + source + " must be a JSON object");
+ }
+ JsonObject object = json.getAsJsonObject();
+ String id = requiredString(object, "id", source);
+ PerkArchetype archetype = enumValue(PerkArchetype.class, requiredString(object, "archetype", source), "archetype", source);
+ int pointCost = requiredInt(object, "point_cost", source);
+ List<String> prerequisites = strings(object, "prerequisites", source);
+ List<PerkBonus> bonuses = bonuses(object, source);
+ return new PerkNode(id, archetype, pointCost, prerequisites, bonuses);
+ }
+
+ private static List<PerkBonus> bonuses(JsonObject object, ResourceLocation source) {
+ JsonArray array = requiredArray(object, "bonuses", source);
+ List<PerkBonus> bonuses = new ArrayList<>();
+ for (JsonElement element : array) {
+ if (!element.isJsonObject()) {
+ throw new JsonParseException("Perk " + source + " bonus entries must be objects");
+ }
+ JsonObject bonus = element.getAsJsonObject();
+ PerkStat stat = enumValue(PerkStat.class, requiredString(bonus, "stat", source), "stat", source);
+ double amount = requiredDouble(bonus, "amount", source);
+ bonuses.add(new PerkBonus(stat, amount));
+ }
+ return bonuses;
+ }
+
+ private static List<String> strings(JsonObject object, String key, ResourceLocation source) {
+ JsonElement element = object.get(key);
+ if (element == null) return List.of();
+ if (!element.isJsonArray()) {
+ throw new JsonParseException("Perk " + source + " field '" + key + "' must be an array");
+ }
+ List<String> values = new ArrayList<>();
+ for (JsonElement value : element.getAsJsonArray()) {
+ if (!value.isJsonPrimitive() || !value.getAsJsonPrimitive().isString()) {
+ throw new JsonParseException("Perk " + source + " field '" + key + "' must contain only strings");
+ }
+ values.add(value.getAsString());
+ }
+ return values;
+ }
+
+ private static String requiredString(JsonObject object, String key, ResourceLocation source) {
+ JsonElement element = object.get(key);
+ if (element == null || !element.isJsonPrimitive() || !element.getAsJsonPrimitive().isString()) {
+ throw new JsonParseException("Perk " + source + " requires string field '" + key + "'");
+ }
+ return element.getAsString();
+ }
+
+ private static int requiredInt(JsonObject object, String key, ResourceLocation source) {
+ JsonElement element = object.get(key);
+ if (element == null || !element.isJsonPrimitive() || !element.getAsJsonPrimitive().isNumber()) {
+ throw new JsonParseException("Perk " + source + " requires numeric field '" + key + "'");
+ }
+ return element.getAsInt();
+ }
+
+ private static double requiredDouble(JsonObject object, String key, ResourceLocation source) {
+ JsonElement element = object.get(key);
+ if (element == null || !element.isJsonPrimitive() || !element.getAsJsonPrimitive().isNumber()) {
+ throw new JsonParseException("Perk " + source + " requires numeric field '" + key + "'");
+ }
+ return element.getAsDouble();
+ }
+
+ private static JsonArray requiredArray(JsonObject object, String key, ResourceLocation source) {
+ JsonElement element = object.get(key);
+ if (element == null || !element.isJsonArray()) {
+ throw new JsonParseException("Perk " + source + " requires array field '" + key + "'");
+ }
+ return element.getAsJsonArray();
+ }
+
+ private static <T extends Enum<T>> T enumValue(Class<T> type, String value, String key, ResourceLocation source) {
+ try {
+ return Enum.valueOf(type, value.toUpperCase(java.util.Locale.ROOT));
+ } catch (IllegalArgumentException ex) {
+ throw new JsonParseException("Perk " + source + " has invalid '" + key + "': " + value, ex);
+ }
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/perks/PlayerPerkProgressService.java b/src/main/java/com/talhanation/bannermod/entity/military/perks/PlayerPerkProgressService.java
new file mode 100644
index 00000000..90879242
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/entity/military/perks/PlayerPerkProgressService.java
@@ -0,0 +1,39 @@
+package com.talhanation.bannermod.entity.military.perks;
+
+import com.talhanation.bannermod.registry.ModAttachments;
+import net.minecraft.server.level.ServerPlayer;
+
+import java.util.Set;
+
+public final class PlayerPerkProgressService {
+ private static final int PERK_POINTS_PER_LEVEL = 1;
+
+ private PlayerPerkProgressService() {
+ }
+
+ public static PerkProgress progress(ServerPlayer player) {
+ return player.getData(ModAttachments.PLAYER_PERKS);
+ }
+
+ public static int availablePoints(ServerPlayer player) {
+ return progress(player).getAvailablePoints();
+ }
+
+ public static Set<String> unlockedPerkIds(ServerPlayer player) {
+ return progress(player).getOwnedPerks();
+ }
+
+ public static void grantLevelPoints(ServerPlayer player, int gainedLevels) {
+ if (gainedLevels <= 0) return;
+ progress(player).grantPoints(gainedLevels * PERK_POINTS_PER_LEVEL);
+ }
+
+ public static PerkProgress.UnlockResult unlock(ServerPlayer player, String perkId) {
+ PerkNode node = PerkRegistry.get(perkId).orElse(null);
+ return progress(player).unlock(node);
+ }
+
+ public static int respec(ServerPlayer player) {
+ return progress(player).respec();
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/entity/military/runtime/DebugEvents.java b/src/main/java/com/talhanation/bannermod/entity/military/runtime/DebugEvents.java
index 27442a65..8b3d1a30 100644
--- a/src/main/java/com/talhanation/bannermod/entity/military/runtime/DebugEvents.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/runtime/DebugEvents.java
@@ -3,7 +3,6 @@
import com.talhanation.bannermod.config.RecruitsServerConfig;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.ICompanion;
-import com.talhanation.bannermod.events.RecruitEvents;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
diff --git a/src/main/java/com/talhanation/bannermod/events/RecruitEvents.java b/src/main/java/com/talhanation/bannermod/entity/military/runtime/RecruitEvents.java
similarity index 92%
rename from src/main/java/com/talhanation/bannermod/events/RecruitEvents.java
rename to src/main/java/com/talhanation/bannermod/entity/military/runtime/RecruitEvents.java
index 5315794b..bebc6b51 100644
--- a/src/main/java/com/talhanation/bannermod/events/RecruitEvents.java
+++ b/src/main/java/com/talhanation/bannermod/entity/military/runtime/RecruitEvents.java
@@ -1,17 +1,16 @@
-package com.talhanation.bannermod.events;
-import com.talhanation.bannermod.bootstrap.BannerModMain;
+package com.talhanation.bannermod.entity.military.runtime;
+import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.governance.BannerModGovernorPolicy;
import com.talhanation.bannermod.governance.runtime.RecruitGovernorWorkflow;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.ICompanion;
+import com.talhanation.bannermod.api.event.RecruitEvent;
import com.talhanation.bannermod.registry.military.ModEntityTypes;
import com.talhanation.bannermod.inventory.military.PromoteContainer;
import com.talhanation.bannermod.network.messages.military.MessageOpenPromoteScreen;
import com.talhanation.bannermod.persistence.military.*;
-import com.talhanation.bannermod.events.RecruitEvent;
import com.talhanation.bannermod.combat.runtime.RecruitCombatRuntime;
-import com.talhanation.bannermod.entity.military.runtime.RecruitWorldLifecycleService;
import net.neoforged.neoforge.common.NeoForge;
import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer;
@@ -31,8 +30,8 @@
import java.util.*;
public class RecruitEvents {
- static final Map<ServerLevel, RecruitsPatrolSpawn> RECRUIT_PATROL = new HashMap<>();
- static final Map<ServerLevel, PillagerPatrolSpawn> PILLAGER_PATROL = new HashMap<>();
+ public static final Map<ServerLevel, RecruitsPatrolSpawn> RECRUIT_PATROL = new HashMap<>();
+ public static final Map<ServerLevel, PillagerPatrolSpawn> PILLAGER_PATROL = new HashMap<>();
private static RecruitsPlayerUnitManager recruitsPlayerUnitManager;
private static RecruitsGroupsManager recruitsGroupsManager;
@@ -58,9 +57,9 @@ public static MinecraftServer server() {
return server;
}
- static void installRuntime(MinecraftServer currentServer,
- RecruitsPlayerUnitManager currentPlayerUnitManager,
- RecruitsGroupsManager currentGroupsManager) {
+ public static void installRuntime(MinecraftServer currentServer,
+ RecruitsPlayerUnitManager currentPlayerUnitManager,
+ RecruitsGroupsManager currentGroupsManager) {
server = currentServer;
recruitsPlayerUnitManager = currentPlayerUnitManager;
recruitsGroupsManager = currentGroupsManager;
diff --git a/src/main/java/com/talhanation/bannermod/events/AssassinEvents.java b/src/main/java/com/talhanation/bannermod/events/AssassinEvents.java
deleted file mode 100644
index e09d39a8..00000000
--- a/src/main/java/com/talhanation/bannermod/events/AssassinEvents.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package com.talhanation.bannermod.events;
-
-public class AssassinEvents {
- /*
- public static void createAssassin(String playerName, int count, Level world) {
- MinecraftServer server = world.getServer();
- PlayerList list = server.getPlayerList();
- Player target = list.getPlayerByName(playerName);
- BlockPos blockPos;
-
- if (target != null) {
- blockPos = calculateSpawnPos(target);
-
- while (!hasEnoughSpace(world, blockPos)){
- blockPos = calculateSpawnPos(target);
- }
- /*
- if (hasEnoughSpace(world, blockPos)){
- world.setBlock(blockPos, Blocks.REDSTONE_BLOCK.defaultBlockState(), 3);
- for (int i = 0; i < count; i++) {
- AssassinEntity assassin = ModEntityTypes.ASSASSIN.get().create(target.level);
- assassin.setPos(blockPos.getX(), blockPos.getY() + 1, blockPos.getZ());
- assassin.setEquipment();
- //assassin.setIsOwned(false);
- assassin.setIsInOrder(true);
- assassin.setDropEquipment();
- assassin.setPersistenceRequired();
- assassin.setCanPickUpLoot(true);
- assassin.setTarget(target);
- target.getCommandSenderWorld().addFreshEntity(assassin);
- }
- }
- }
-
- }
-
- private static BlockPos calculateSpawnPos(Player target){
- BlockPos blockPos = null;
-
-
- for(int i = 0; i < 10; ++i) {
- int d0 = (int) (target.getX() + (target.getCommandSenderWorld().random.nextInt(16) + 32));
- int d2 = (int) (target.getZ() + (target.getCommandSenderWorld().random.nextInt(16) + 32));
- int d1 = target.getCommandSenderWorld().getHeight(Heightmap.Types.WORLD_SURFACE, d0, d2);
-
-
- BlockPos blockpos1 = new BlockPos(d0, d1, d2);
-
- if (NaturalSpawner.isSpawnPositionOk(SpawnPlacements.Type.ON_GROUND, target.level, blockpos1, ModEntityTypes.ASSASSIN.get())) {
- blockPos = blockpos1;
- break;
- }
- }
- return blockPos;
- }
-
- private static boolean hasEnoughSpace(BlockGetter reader, BlockPos pos) {
- for(BlockPos blockpos : BlockPos.betweenClosed(pos, pos.offset(1, 2, 1))) {
- if (!reader.getBlockState(blockpos).getCollisionShape(reader, blockpos).isEmpty()) {
- return false;
- }
- }
-
- return true;
- }
-
- public static void doPayment(Player player, int costs){
- Inventory playerInv = player.getInventory();
- int playerEmeralds = 0;
- String str = RecruitsModConfig.RecruitCurrency.get();
- ItemStack currencyItemStack;
- Optional<Holder<Item>> holder = BuiltInRegistries.ITEM.getHolder(ResourceLocation.tryParse(str));
-
- if (holder.isPresent()){
- currencyItemStack = holder.get().value().getDefaultInstance();
- }
- else
- currencyItemStack = Items.EMERALD.getDefaultInstance();
-
- //checkPlayerMoney
- playerEmeralds = playerGetEmeraldsInInventory(player);
- //player.sendMessage(new TextComponent("PlayerEmeralds: " + playerEmeralds), player.getUUID());
- //player.sendMessage(new TextComponent("Costs: " + costs), player.getUUID());
- playerEmeralds = playerEmeralds - costs;
-
- //remove Player Emeralds
- for (int i = 0; i < playerInv.getContainerSize(); i++){
- ItemStack itemStackInSlot = playerInv.getItem(i);
- Item itemInSlot = itemStackInSlot.getItem();
- if (itemInSlot.equals(currencyItemStack)){
- playerInv.removeItemNoUpdate(i);
- }
- }
-
- //add Player Emeralds what is left
- ItemStack emeraldsLeft = Items.EMERALD.getDefaultInstance();
-
- emeraldsLeft.setCount(playerEmeralds);
- playerInv.add(emeraldsLeft);
- }
-
-
- public static int playerGetEmeraldsInInventory(Player player) {
- int emeralds = 0;
- Inventory playerInv = player.getInventory();
- for (int i = 0; i < playerInv.getContainerSize(); i++){
- ItemStack itemStackInSlot = playerInv.getItem(i);
- Item itemInSlot = itemStackInSlot.getItem();
- if (itemInSlot == Items.EMERALD){
- emeralds = emeralds + itemStackInSlot.getCount();
- }
- }
- return emeralds;
- }
-
- public static boolean playerHasEnoughEmeralds(Player player, int price) {
- int emeraldCount = AssassinEvents.playerGetEmeraldsInInventory(player);
- if (emeraldCount >= price){
- return true;
- }
- return player.isCreative();
- }
- */
-}
diff --git a/src/main/java/com/talhanation/bannermod/events/DamageEvent.java b/src/main/java/com/talhanation/bannermod/events/DamageEvent.java
index fed7221d..caa0a711 100644
--- a/src/main/java/com/talhanation/bannermod/events/DamageEvent.java
+++ b/src/main/java/com/talhanation/bannermod/events/DamageEvent.java
@@ -1,6 +1,7 @@
package com.talhanation.bannermod.events;
import com.talhanation.bannermod.config.RecruitsServerConfig;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
diff --git a/src/main/java/com/talhanation/bannermod/events/RecruitLifecycleEvents.java b/src/main/java/com/talhanation/bannermod/events/RecruitLifecycleEvents.java
index 54eecb7c..835cad2b 100644
--- a/src/main/java/com/talhanation/bannermod/events/RecruitLifecycleEvents.java
+++ b/src/main/java/com/talhanation/bannermod/events/RecruitLifecycleEvents.java
@@ -3,6 +3,7 @@
import com.talhanation.bannermod.ai.pathfinding.AsyncPathProcessor;
import com.talhanation.bannermod.ai.pathfinding.async.TrueAsyncPathfindingRuntime;
import com.talhanation.bannermod.entity.military.RecruitIndex;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.runtime.RecruitWorldLifecycleService;
import com.talhanation.bannermod.governance.runtime.RecruitGovernorWorkflow;
import com.talhanation.bannermod.util.FormationDimensionGuard;
diff --git a/src/main/java/com/talhanation/bannermod/events/WorkersCommandEvents.java b/src/main/java/com/talhanation/bannermod/events/WorkersCommandEvents.java
deleted file mode 100644
index 974960b8..00000000
--- a/src/main/java/com/talhanation/bannermod/events/WorkersCommandEvents.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.talhanation.bannermod.events;
-
-import com.talhanation.bannermod.entity.civilian.*;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.phys.AABB;
-
-import java.util.*;
-
-public class WorkersCommandEvents {
- public void setWorkArea(UUID player_uuid, AbstractWorkerEntity worker, AABB area) {
- LivingEntity owner = worker.getOwner();
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/events/civilian/SettlementWorkOrderClaimReleaseEvents.java b/src/main/java/com/talhanation/bannermod/events/civilian/SettlementWorkOrderClaimReleaseEvents.java
index c2a5a149..4d506ba9 100644
--- a/src/main/java/com/talhanation/bannermod/events/civilian/SettlementWorkOrderClaimReleaseEvents.java
+++ b/src/main/java/com/talhanation/bannermod/events/civilian/SettlementWorkOrderClaimReleaseEvents.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.events.civilian;
import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
-import com.talhanation.bannermod.settlement.BannerModSettlementOrchestrator;
+import com.talhanation.bannermod.settlement.SettlementOrchestrator;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import net.minecraft.server.level.ServerLevel;
@@ -50,7 +50,7 @@ public void onWorkerLeave(EntityLeaveLevelEvent event) {
}
private static void releaseFor(ServerLevel serverLevel, UUID residentUuid) {
- SettlementWorkOrderRuntime runtime = BannerModSettlementOrchestrator.workOrderRuntime(serverLevel);
+ SettlementWorkOrderRuntime runtime = SettlementOrchestrator.workOrderRuntime(serverLevel);
if (runtime == null) return;
List<SettlementWorkOrder> released = runtime.releaseClaimsForResident(residentUuid);
if (!released.isEmpty()) {
diff --git a/src/main/java/com/talhanation/bannermod/governance/runtime/RecruitGovernorWorkflow.java b/src/main/java/com/talhanation/bannermod/governance/runtime/RecruitGovernorWorkflow.java
index b4ac3d2c..1d3217dd 100644
--- a/src/main/java/com/talhanation/bannermod/governance/runtime/RecruitGovernorWorkflow.java
+++ b/src/main/java/com/talhanation/bannermod/governance/runtime/RecruitGovernorWorkflow.java
@@ -15,9 +15,9 @@
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Envelope;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Payload;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.RefreshTrigger;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementService;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
@@ -52,10 +52,10 @@ public static boolean tryPromoteRecruit(AbstractRecruitEntity recruit, String na
if (result.allowed()) {
RecruitsClaim claim = resolveClaim(recruit);
if (claim != null) {
- BannerModSettlementService.refreshClaim(
+ SettlementService.refreshClaim(
serverLevel,
ClaimEvents.claimManager(),
- BannerModSettlementManager.get(serverLevel),
+ SettlementManager.get(serverLevel),
BannerModGovernorManager.get(serverLevel),
claim
);
@@ -93,7 +93,7 @@ public static void syncGovernorScreen(ServerPlayer player, AbstractRecruitEntity
Envelope envelope = Envelope.empty(0L, gameTime, RefreshTrigger.SCREEN_OPEN);
if (claim != null && recruit.getCommandSenderWorld() instanceof ServerLevel serverLevel) {
BannerModGovernorSnapshot governorSnapshot = governorService(serverLevel).getOrCreateGovernorSnapshot(claim);
- BannerModSettlementSnapshot settlementSnapshot = BannerModSettlementManager.get(serverLevel).getSnapshot(claim.getUUID());
+ SettlementSnapshot settlementSnapshot = SettlementManager.get(serverLevel).getSnapshot(claim.getUUID());
envelope = buildEnvelope(claim, settlementSnapshot, governorSnapshot, gameTime, RefreshTrigger.SCREEN_OPEN);
}
@@ -104,13 +104,13 @@ public static void syncGovernorScreen(ServerPlayer player, AbstractRecruitEntity
public static void syncGovernorSnapshotsOnLogin(ServerPlayer player) {
ServerLevel level = player.serverLevel();
BannerModGovernorManager governorManager = BannerModGovernorManager.get(level);
- BannerModSettlementManager settlementManager = BannerModSettlementManager.get(level);
+ SettlementManager settlementManager = SettlementManager.get(level);
long gameTime = level.getGameTime();
for (BannerModGovernorSnapshot governorSnapshot : governorManager.getAllSnapshots()) {
if (!player.getUUID().equals(governorSnapshot.governorOwnerUuid()) || governorSnapshot.governorRecruitUuid() == null) {
continue;
}
- BannerModSettlementSnapshot settlementSnapshot = settlementManager.getSnapshot(governorSnapshot.claimUuid());
+ SettlementSnapshot settlementSnapshot = settlementManager.getSnapshot(governorSnapshot.claimUuid());
Envelope envelope = buildEnvelope(governorSnapshot.claimUuid(), settlementSnapshot, governorSnapshot,
gameTime, RefreshTrigger.LOGIN);
sendGovernorUpdate(player, governorSnapshot.governorRecruitUuid(), envelope);
@@ -126,13 +126,13 @@ public static void syncGovernorMutationRefresh(ServerLevel level, RecruitsClaim
if (player == null) {
return;
}
- BannerModSettlementSnapshot settlementSnapshot = BannerModSettlementManager.get(level).getSnapshot(claim.getUUID());
+ SettlementSnapshot settlementSnapshot = SettlementManager.get(level).getSnapshot(claim.getUUID());
Envelope envelope = buildEnvelope(claim, settlementSnapshot, governorSnapshot, level.getGameTime(), RefreshTrigger.MUTATION_REFRESH);
sendGovernorUpdate(player, governorSnapshot.governorRecruitUuid(), envelope);
}
public static Envelope buildEnvelope(RecruitsClaim claim,
- BannerModSettlementSnapshot settlementSnapshot,
+ SettlementSnapshot settlementSnapshot,
BannerModGovernorSnapshot governorSnapshot,
long gameTime,
RefreshTrigger trigger) {
@@ -140,7 +140,7 @@ public static Envelope buildEnvelope(RecruitsClaim claim,
}
public static Envelope buildEnvelope(java.util.UUID claimUuid,
- BannerModSettlementSnapshot settlementSnapshot,
+ SettlementSnapshot settlementSnapshot,
BannerModGovernorSnapshot governorSnapshot,
long gameTime,
RefreshTrigger trigger) {
diff --git a/src/main/java/com/talhanation/bannermod/items/military/RecruitsSpawnEgg.java b/src/main/java/com/talhanation/bannermod/items/military/RecruitsSpawnEgg.java
index d86599e1..f9f6b325 100644
--- a/src/main/java/com/talhanation/bannermod/items/military/RecruitsSpawnEgg.java
+++ b/src/main/java/com/talhanation/bannermod/items/military/RecruitsSpawnEgg.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.items.military;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponents;
diff --git a/src/main/java/com/talhanation/bannermod/network/catalog/CivilianPacketCatalog.java b/src/main/java/com/talhanation/bannermod/network/catalog/CivilianPacketCatalog.java
index 39416d03..a203b36d 100644
--- a/src/main/java/com/talhanation/bannermod/network/catalog/CivilianPacketCatalog.java
+++ b/src/main/java/com/talhanation/bannermod/network/catalog/CivilianPacketCatalog.java
@@ -40,6 +40,7 @@ public final class CivilianPacketCatalog {
MessageReassignWorkerProfession.class,
MessageAssignCitizenVacancy.class,
MessageAssignHome.class,
+ MessageDismissWorker.class,
};
public static final PacketCatalog CATALOG = new PacketCatalog(MESSAGES);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageAssignHome.java b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageAssignHome.java
index da7a7a58..4ce6bbcc 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageAssignHome.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageAssignHome.java
@@ -6,6 +6,11 @@
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import com.talhanation.bannermod.network.payload.BannerModMessage;
+import com.talhanation.bannermod.settlement.building.BuildingValidationState;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRegistryData;
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
import net.minecraft.core.BlockPos;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.chat.Component;
@@ -13,13 +18,12 @@
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.block.BedBlock;
import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import java.util.Objects;
import java.util.UUID;
/**
@@ -68,7 +72,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer sender = Objects.requireNonNull(context.getSender(), "sender required for MessageAssignHome");
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
handle(sender, this.entityUuid, this.pos);
});
}
@@ -144,14 +149,25 @@ private static UUID ownerOf(Entity entity) {
return null;
}
- /**
- * A "valid" home is currently a vanilla {@link BedBlock}. HousePrefab build
- * area validation is intentionally out-of-scope for this slice; HOMEASSIGN-002
- * only requires bed/sleeping-zone acceptance and the bed path is universal.
- */
+ /** A valid home is a vanilla bed or a server-registered valid sleeping zone. */
public static boolean isValidHomeTarget(ServerLevel level, BlockPos pos) {
BlockState state = level.getBlockState(pos);
- return state.getBlock() instanceof BedBlock;
+ return state.getBlock() instanceof BedBlock || isValidatedSleepingZone(level, pos);
+ }
+
+ private static boolean isValidatedSleepingZone(ServerLevel level, BlockPos pos) {
+ AABB pointBounds = new AABB(pos);
+ for (ValidatedBuildingRecord record : ValidatedBuildingRegistryData.get(level).findIntersecting(pointBounds)) {
+ if (record.state() != BuildingValidationState.VALID || !level.dimension().equals(record.dimension())) {
+ continue;
+ }
+ for (ZoneSelection zone : record.zones()) {
+ if (zone.role() == ZoneRole.SLEEPING && zone.contains(pos)) {
+ return true;
+ }
+ }
+ }
+ return false;
}
@Override
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageDismissWorker.java b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageDismissWorker.java
new file mode 100644
index 00000000..1504bb9c
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageDismissWorker.java
@@ -0,0 +1,61 @@
+package com.talhanation.bannermod.network.messages.civilian;
+
+import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
+import com.talhanation.bannermod.entity.civilian.WorkerDismissService;
+import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
+import com.talhanation.bannermod.network.payload.BannerModMessage;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.PacketFlow;
+import net.minecraft.server.level.ServerPlayer;
+
+import java.util.UUID;
+
+public class MessageDismissWorker implements BannerModMessage<MessageDismissWorker> {
+ private UUID workerUuid;
+
+ public MessageDismissWorker() {
+ }
+
+ public MessageDismissWorker(UUID workerUuid) {
+ this.workerUuid = workerUuid;
+ }
+
+ @Override
+ public PacketFlow getExecutingSide() {
+ return BannerModMessage.serverbound();
+ }
+
+ @Override
+ public void executeServerSide(BannerModNetworkContext context) {
+ context.enqueueWork(() -> {
+ ServerPlayer player = context.getSender();
+ if (player == null || this.workerUuid == null) {
+ return;
+ }
+ if (!(player.serverLevel().getEntity(this.workerUuid) instanceof AbstractWorkerEntity worker)) {
+ player.sendSystemMessage(Component.translatable("chat.bannermod.workerui.dismiss.denied.missing"));
+ return;
+ }
+ String denialKey = WorkerDismissService.dismissDeniedReasonKey(player, worker);
+ if (denialKey != null) {
+ player.sendSystemMessage(Component.translatable(denialKey));
+ return;
+ }
+ if (WorkerDismissService.dismiss(player, worker)) {
+ player.sendSystemMessage(Component.translatable("chat.bannermod.workerui.dismiss.success"));
+ }
+ });
+ }
+
+ @Override
+ public MessageDismissWorker fromBytes(FriendlyByteBuf buf) {
+ this.workerUuid = buf.readUUID();
+ return this;
+ }
+
+ @Override
+ public void toBytes(FriendlyByteBuf buf) {
+ buf.writeUUID(this.workerUuid);
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantEditTradeScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantEditTradeScreen.java
index eebbde92..90aad2d9 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantEditTradeScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantEditTradeScreen.java
@@ -34,10 +34,11 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- if (!context.getSender().getUUID().equals(player)) {
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
+ if (!player.getUUID().equals(this.player)) {
return;
}
- ServerPlayer player = context.getSender();
Entity entity = player.serverLevel().getEntity(this.merchantUuid);
if (entity instanceof MerchantEntity merchant
&& merchant.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantTradeScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantTradeScreen.java
index 427afe3b..e3ca5b89 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantTradeScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageOpenMerchantTradeScreen.java
@@ -31,6 +31,7 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.merchantUuid);
if (entity instanceof MerchantEntity merchant
&& merchant.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageUpdateStorageArea.java b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageUpdateStorageArea.java
index af4f4469..a91212fa 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageUpdateStorageArea.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageUpdateStorageArea.java
@@ -4,8 +4,8 @@
import com.talhanation.bannermod.governance.BannerModGovernorManager;
import com.talhanation.bannermod.entity.civilian.workarea.StorageArea;
import com.talhanation.bannermod.shared.logistics.BannerModLogisticsAuthoringState;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementService;
import com.talhanation.bannermod.network.payload.BannerModMessage;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.FriendlyByteBuf;
@@ -71,10 +71,10 @@ public void update(StorageArea storageArea, ServerPlayer player){
}
if (player.level() instanceof ServerLevel serverLevel && ClaimEvents.claimManager() != null) {
- BannerModSettlementService.refreshClaimAt(
+ SettlementService.refreshClaimAt(
serverLevel,
ClaimEvents.claimManager(),
- BannerModSettlementManager.get(serverLevel),
+ SettlementManager.get(serverLevel),
BannerModGovernorManager.get(serverLevel),
storageArea.blockPosition()
);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAdminRecruitSpawn.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAdminRecruitSpawn.java
index cf8627d8..da17f75f 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAdminRecruitSpawn.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAdminRecruitSpawn.java
@@ -16,7 +16,6 @@
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobSpawnType;
-import java.util.Objects;
public class MessageAdminRecruitSpawn implements BannerModMessage<MessageAdminRecruitSpawn> {
private String entityId;
@@ -39,7 +38,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.hasPermissions(2) || !player.isCreative()) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggro.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggro.java
index d9311a78..f7ca2247 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggro.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggro.java
@@ -15,7 +15,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageAggro implements BannerModMessage<MessageAggro> {
@@ -44,7 +43,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
double boundBoxInflateModifier = fromGui ? 16.0D : 100.0D;
AABB commandBox = player.getBoundingBox().inflate(boundBoxInflateModifier);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggroGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggroGui.java
index e914059a..bae83190 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggroGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAggroGui.java
@@ -8,7 +8,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageAggroGui implements BannerModMessage<MessageAggroGui> {
@@ -30,7 +29,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.uuid, 16.0D);
if (RecruitCommandAuthority.canDirectlyControl(player, recruit)) {
recruit.setAggroState(this.state);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAnswerMessenger.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAnswerMessenger.java
index 852d26be..9b870467 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAnswerMessenger.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAnswerMessenger.java
@@ -8,7 +8,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageAnswerMessenger implements BannerModMessage<MessageAnswerMessenger> {
@@ -26,7 +25,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof MessengerEntity messenger && messenger.distanceToSqr(player) <= 16D * 16D) {
messenger.teleportWaitTimer = 100;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageApplyNoGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageApplyNoGroup.java
index 30a4d282..64e04cff 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageApplyNoGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageApplyNoGroup.java
@@ -31,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
List<AbstractRecruitEntity> recruitList = new ArrayList<>();
ServerLevel serverLevel = (ServerLevel) player.getCommandSenderWorld();
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinCount.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinCount.java
index 31522d4a..168b6cc0 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinCount.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinCount.java
@@ -8,7 +8,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageAssassinCount implements BannerModMessage<MessageAssassinCount> {
@@ -30,12 +29,12 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.uuid);
if (entity instanceof AssassinLeaderEntity leader
- && (leader.isControlledBy(player) || player.hasPermissions(2))
&& player.getBoundingBox().inflate(16.0D).intersects(leader.getBoundingBox())) {
- leader.setCount(this.count);
+ leader.trySetCountFrom(player.getUUID(), player.hasPermissions(2), this.count);
}
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinGui.java
index 2df8ab4c..d388323a 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinGui.java
@@ -9,7 +9,6 @@
import net.minecraft.network.FriendlyByteBuf;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageAssassinGui implements BannerModMessage<MessageAssassinGui> {
@@ -35,7 +34,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(uuid)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinate.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinate.java
index dcca3382..b606b3e6 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinate.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinate.java
@@ -11,7 +11,6 @@
import net.minecraft.server.players.PlayerList;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
public class MessageAssassinate implements BannerModMessage<MessageAssassinate> {
@@ -36,7 +35,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
ServerLevel world = player.serverLevel();
MinecraftServer server = world.getServer();
PlayerList list = server.getPlayerList();
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToCompanion.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToCompanion.java
index 55c1ff04..362d1364 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToCompanion.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToCompanion.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.army.command.RecruitCommandAuthority;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractLeaderEntity;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.ICompanion;
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageAssignGroupToCompanion implements BannerModMessage<MessageAssignGroupToCompanion> {
@@ -41,7 +40,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
ServerLevel serverLevel = serverPlayer.serverLevel();
Entity entity = serverLevel.getEntity(this.companionUUID);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToPlayer.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToPlayer.java
index 61eddbf0..75f92eb3 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToPlayer.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignGroupToPlayer.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.army.command.RecruitCommandAuthority;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.RecruitIndex;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
@@ -47,7 +46,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
RecruitsPlayerInfo newOwner = RecruitsPlayerInfo.getFromNBT(tag);
transferGroupToPlayer(player, groupUUID, newOwner);
});
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignNearbyRecruitsInGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignNearbyRecruitsInGroup.java
index e957ca9c..191c1ada 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignNearbyRecruitsInGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignNearbyRecruitsInGroup.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.RecruitIndex;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
@@ -12,7 +12,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageAssignNearbyRecruitsInGroup implements BannerModMessage<MessageAssignNearbyRecruitsInGroup> {
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
RecruitsGroup newGroup = RecruitEvents.groupsManager().getGroup(groupUUID);
if(newGroup == null) return;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignRecruitToPlayer.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignRecruitToPlayer.java
index 73b09019..864eb83b 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignRecruitToPlayer.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssignRecruitToPlayer.java
@@ -8,7 +8,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageAssignRecruitToPlayer implements BannerModMessage<MessageAssignRecruitToPlayer> {
@@ -29,7 +28,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(serverPlayer, this.recruit, 64.0D);
assignRecruitToPlayer(serverPlayer, recruit, newOwner);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAttack.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAttack.java
index d6b2b3ce..ae1008ac 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAttack.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageAttack.java
@@ -16,7 +16,6 @@
import java.util.HashSet;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.UUID;
@@ -38,7 +37,8 @@ public PacketFlow getExecutingSide() {
}
public void executeServerSide(BannerModNetworkContext context) {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
if (!com.talhanation.bannermod.network.throttle.PacketRateLimiter.shared()
.tryAcquire(serverPlayer.getUUID(), MessageAttack.class)) {
RuntimeProfilingCounters.increment("network.rate_limit.dropped.attack");
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageBackToMountEntity.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageBackToMountEntity.java
index 1dab8b6f..4eb5f287 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageBackToMountEntity.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageBackToMountEntity.java
@@ -13,7 +13,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageBackToMountEntity implements BannerModMessage<MessageBackToMountEntity> {
@@ -36,7 +35,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
UUID actorUuid = authorizedPlayerUuid(player.getUUID(), this.uuid);
List<AbstractRecruitEntity> recruits = this.group == null
? RecruitIndex.instance().ownerInRange(player.getCommandSenderWorld(), actorUuid, player.position(), 100.0D)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTarget.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTarget.java
index a4a5164a..e4e1837c 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTarget.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTarget.java
@@ -9,7 +9,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageClearTarget implements BannerModMessage<MessageClearTarget> {
@@ -31,7 +30,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
dispatchToServer(player, this.uuid, this.group);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTargetGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTargetGui.java
index eb7799e1..4333047c 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTargetGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearTargetGui.java
@@ -9,7 +9,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageClearTargetGui implements BannerModMessage<MessageClearTargetGui> {
@@ -30,7 +29,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.recruit, 16.0D);
if (recruit != null && RecruitCommandAuthority.canDirectlyControl(player, recruit)) {
CommandEvents.onClearTargetButton(recruit.getOwnerUUID(), recruit, null);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeep.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeep.java
index cef77ec3..3f41685a 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeep.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeep.java
@@ -11,7 +11,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageClearUpkeep implements BannerModMessage<MessageClearUpkeep> {
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
UUID actorUuid = authorizedPlayerUuid(player.getUUID(), this.uuid);
List<AbstractRecruitEntity> recruits = this.group == null
? RecruitIndex.instance().ownerInRange(player.getCommandSenderWorld(), actorUuid, player.position(), 100.0D)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeepGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeepGui.java
index 3defa5a9..9c1dd564 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeepGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageClearUpkeepGui.java
@@ -7,7 +7,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageClearUpkeepGui implements BannerModMessage<MessageClearUpkeepGui> {
@@ -27,7 +26,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.uuid, 16.0D);
if (recruit != null) {
recruit.clearUpkeepPos();
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStance.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStance.java
index 50113d44..233d1f88 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStance.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStance.java
@@ -18,7 +18,6 @@
import java.util.HashSet;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.UUID;
@@ -42,7 +41,8 @@ public PacketFlow getExecutingSide() {
}
public void executeServerSide(BannerModNetworkContext context) {
- ServerPlayer sender = Objects.requireNonNull(context.getSender());
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
if (!com.talhanation.bannermod.network.throttle.PacketRateLimiter.shared()
.tryAcquire(sender.getUUID(), MessageCombatStance.class)) {
RuntimeProfilingCounters.increment("network.rate_limit.dropped.stance");
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStanceGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStanceGui.java
index b64f10c1..ec40cc19 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStanceGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCombatStanceGui.java
@@ -10,7 +10,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageCombatStanceGui implements BannerModMessage<MessageCombatStanceGui> {
@@ -36,7 +35,8 @@ public void executeServerSide(BannerModNetworkContext context) {
return;
}
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(serverPlayer, this.recruitUuid, 16.0D);
if (recruit == null) {
return;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCommandScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCommandScreen.java
index 56159dc0..6f59c2b3 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCommandScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageCommandScreen.java
@@ -31,6 +31,7 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(uuid)) {
return;
}
@@ -49,4 +50,4 @@ public void toBytes(FriendlyByteBuf buf) {
buf.writeUUID(uuid);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugGui.java
index 9e6647d2..9f0d7971 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugGui.java
@@ -12,7 +12,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageDebugGui implements BannerModMessage<MessageDebugGui> {
@@ -36,14 +35,15 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.uuid, 16.0D);
if (recruit != null) {
if (!shouldHandleDebugMessage(id, player, recruit)) {
return;
}
- DebugEvents.handleMessage(id, recruit, context.getSender());
+ DebugEvents.handleMessage(id, recruit, player);
recruit.setCustomName(Component.literal(name));
}
});
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugScreen.java
index c3ca9313..2edc2fee 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDebugScreen.java
@@ -8,7 +8,6 @@
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageDebugScreen implements BannerModMessage<MessageDebugScreen> {
@@ -33,7 +32,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(uuid)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisband.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisband.java
index fd06eb18..5d0253ec 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisband.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisband.java
@@ -8,7 +8,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageDisband implements BannerModMessage<MessageDisband> {
@@ -30,10 +29,11 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.recruit, 16D);
if (RecruitCommandAuthority.canDirectlyControl(player, recruit)) {
- recruit.disband(context.getSender(), keepTeam, true);
+ recruit.disband(player, keepTeam, true);
}
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisbandGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisbandGroup.java
index ded7a2a6..08af3ffb 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisbandGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDisbandGroup.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.RecruitIndex;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
@@ -13,7 +13,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageDisbandGroup implements BannerModMessage<MessageDisbandGroup> {
@@ -37,7 +36,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
RecruitsGroup group = RecruitEvents.groupsManager().getGroup(groupUUID);
if(group == null) return;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismount.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismount.java
index da947553..5b08e1d1 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismount.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismount.java
@@ -9,7 +9,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageDismount implements BannerModMessage<MessageDismount> {
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
dispatchToServer(player, this.uuid, this.group);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismountGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismountGui.java
index 8f870f21..a6a94c14 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismountGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageDismountGui.java
@@ -9,7 +9,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageDismountGui implements BannerModMessage<MessageDismountGui> {
@@ -31,7 +30,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(serverPlayer, this.uuid, 16.0D);
if (recruit != null && RecruitCommandAuthority.canDirectlyControl(serverPlayer, recruit)) {
CommandEvents.onDismountButton(recruit.getOwnerUUID(), recruit, null);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFaceCommand.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFaceCommand.java
index 04deae80..8309279e 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFaceCommand.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFaceCommand.java
@@ -14,7 +14,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageFaceCommand implements BannerModMessage<MessageFaceCommand> {
@@ -39,7 +38,8 @@ public PacketFlow getExecutingSide() {
}
public void executeServerSide(BannerModNetworkContext context){
- ServerPlayer sender = Objects.requireNonNull(context.getSender());
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
if (!com.talhanation.bannermod.network.throttle.PacketRateLimiter.shared()
.tryAcquire(sender.getUUID(), MessageFaceCommand.class)) {
RuntimeProfilingCounters.increment("network.rate_limit.dropped.face");
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFollowGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFollowGui.java
index 3a601873..3c6e7cc8 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFollowGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFollowGui.java
@@ -11,7 +11,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageFollowGui implements BannerModMessage<MessageFollowGui> {
@@ -33,7 +32,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
dispatchToServer(serverPlayer, this.uuid, this.state);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFormationFollowMovement.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFormationFollowMovement.java
index 264841c0..3310a7ca 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFormationFollowMovement.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageFormationFollowMovement.java
@@ -8,11 +8,11 @@
import com.talhanation.bannermod.network.payload.BannerModMessage;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
import java.util.HashSet;
import java.util.Set;
@@ -39,7 +39,10 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- dispatchToServer(Objects.requireNonNull(context.getSender()), this.player_uuid, this.group, this.formation);
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
+
+ dispatchToServer(sender, this.player_uuid, this.group, this.formation);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageGroup.java
index 998a2ec8..6646c857 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageGroup.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.army.command.RecruitCommandAuthority;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import com.talhanation.bannermod.network.payload.BannerModMessage;
@@ -10,7 +10,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageGroup implements BannerModMessage<MessageGroup> {
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.recruitUUID, 100.0D);
if (RecruitCommandAuthority.canDirectlyControl(player, recruit)) {
this.setGroup(recruit, player, groupUUID);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHire.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHire.java
index 6e4b9d53..bce4bee1 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHire.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHire.java
@@ -10,7 +10,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageHire implements BannerModMessage<MessageHire> {
@@ -34,7 +33,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
RecruitsGroup group = RecruitCommandAuthority.ownedGroup(player, groupUUID);
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitWithinDistance(player, this.recruit, 16.0D * 16.0D);
if (recruit != null) {
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireFromNobleVillager.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireFromNobleVillager.java
index ae7ccad2..5da51157 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireFromNobleVillager.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireFromNobleVillager.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.VillagerNobleEntity;
import com.talhanation.bannermod.entity.military.runtime.VillagerConversionService;
@@ -20,7 +20,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import com.talhanation.bannermod.network.compat.BannerModPacketDistributor;
-import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
@@ -58,7 +57,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
ServerLevel serverLevel = player.serverLevel();
Entity nobleEntity = serverLevel.getEntity(this.nobleUUID);
if (!(nobleEntity instanceof VillagerNobleEntity villagerNoble)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireGui.java
index 02ffc5ec..80c437ff 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageHireGui.java
@@ -8,7 +8,6 @@
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageHireGui implements BannerModMessage<MessageHireGui> {
@@ -34,7 +33,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(uuid)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageListen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageListen.java
index 8cdf988b..dfdf66fe 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageListen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageListen.java
@@ -8,7 +8,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageListen implements BannerModMessage<MessageListen> {
@@ -30,7 +29,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.uuid, 100.0D);
if (RecruitCommandAuthority.canDirectlyControl(player, recruit)) {
recruit.setListen(bool);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMergeGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMergeGroup.java
index 1989a7b0..f87baf4a 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMergeGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMergeGroup.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import com.talhanation.bannermod.network.payload.BannerModMessage;
@@ -10,7 +10,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageMergeGroup implements BannerModMessage<MessageMergeGroup> {
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
RecruitsGroup groupToMerge = RecruitEvents.groupsManager().getGroup(mergeUUID);
RecruitsGroup baseGroup = RecruitEvents.groupsManager().getGroup(groupUUID);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntity.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntity.java
index abcc2a63..1de50b76 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntity.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntity.java
@@ -15,7 +15,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageMountEntity implements BannerModMessage<MessageMountEntity> {
@@ -39,7 +38,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity mount = player.serverLevel().getEntity(target);
if (mount == null
|| mount.distanceToSqr(player) > 100.0D * 100.0D
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntityGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntityGui.java
index 74722791..bc02b650 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntityGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMountEntityGui.java
@@ -40,7 +40,8 @@ public PacketFlow getExecutingSide() {
@SuppressWarnings({"all"})
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruit = RecruitMessageEntityResolver.resolveRecruitWithinDistance(player, this.recruit, 32.0D * 32.0D);
if (recruit != null) {
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMovement.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMovement.java
index 3d3aa74a..3bf12d70 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMovement.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageMovement.java
@@ -15,7 +15,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
import java.util.HashSet;
import java.util.Set;
@@ -44,14 +43,15 @@ public PacketFlow getExecutingSide() {
}
public void executeServerSide(BannerModNetworkContext context){
- ServerPlayer sender = Objects.requireNonNull(context.getSender());
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
if (!com.talhanation.bannermod.network.throttle.PacketRateLimiter.shared()
.tryAcquire(sender.getUUID(), MessageMovement.class)) {
RuntimeProfilingCounters.increment("network.rate_limit.dropped.movement");
return;
}
context.enqueueWork(() -> {
- dispatchToServer(Objects.requireNonNull(context.getSender()), this.player_uuid, this.group, this.state, this.formation, this.tight);
+ dispatchToServer(sender, this.player_uuid, this.group, this.state, this.formation, this.tight);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenDisbandScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenDisbandScreen.java
index c3a8774d..844c2609 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenDisbandScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenDisbandScreen.java
@@ -32,6 +32,7 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(this.player)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenGovernorScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenGovernorScreen.java
index 8578e7bb..70161626 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenGovernorScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenGovernorScreen.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.network.payload.BannerModMessage;
import net.minecraft.network.protocol.PacketFlow;
@@ -8,7 +8,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageOpenGovernorScreen implements BannerModMessage<MessageOpenGovernorScreen> {
@@ -31,7 +30,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
AbstractRecruitEntity recruitEntity = RecruitMessageEntityResolver.resolveRecruitInInflatedBox(player, this.recruit, 16.0D);
if (recruitEntity != null) {
if (this.openMenu) {
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenPromoteScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenPromoteScreen.java
index d4c66658..1e9dfc6c 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenPromoteScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenPromoteScreen.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.network.payload.BannerModMessage;
import net.minecraft.network.protocol.PacketFlow;
@@ -9,7 +9,6 @@
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageOpenPromoteScreen implements BannerModMessage<MessageOpenPromoteScreen> {
@@ -34,7 +33,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(this.player)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenSpecialScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenSpecialScreen.java
index 283376eb..fee2bca2 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenSpecialScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageOpenSpecialScreen.java
@@ -10,7 +10,6 @@
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageOpenSpecialScreen implements BannerModMessage<MessageOpenSpecialScreen> {
@@ -35,7 +34,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(this.player)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderAddWayPoint.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderAddWayPoint.java
index 9a771525..783ef135 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderAddWayPoint.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderAddWayPoint.java
@@ -20,7 +20,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import com.talhanation.bannermod.network.compat.BannerModPacketDistributor;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderAddWayPoint implements BannerModMessage<MessagePatrolLeaderAddWayPoint> {
@@ -45,7 +44,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.worker);
if (entity instanceof AbstractLeaderEntity leader
&& leader.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderRemoveWayPoint.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderRemoveWayPoint.java
index 1b1bd578..7d5c54c5 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderRemoveWayPoint.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderRemoveWayPoint.java
@@ -13,7 +13,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import com.talhanation.bannermod.network.compat.BannerModPacketDistributor;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderRemoveWayPoint implements BannerModMessage<MessagePatrolLeaderRemoveWayPoint> {
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.worker);
if (entity instanceof AbstractLeaderEntity leader
&& leader.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetCycle.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetCycle.java
index c2902fbd..5dadad8a 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetCycle.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetCycle.java
@@ -9,7 +9,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
@@ -32,7 +31,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof AbstractLeaderEntity leader
&& RecruitCommandAuthority.canDirectlyControl(player, leader)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetEnemyAction.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetEnemyAction.java
index 6ffd37d8..13db62f7 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetEnemyAction.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetEnemyAction.java
@@ -9,7 +9,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderSetEnemyAction implements BannerModMessage<MessagePatrolLeaderSetEnemyAction> {
@@ -30,7 +29,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof AbstractLeaderEntity leader
&& leader.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetInfoMode.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetInfoMode.java
index 045b12e5..9174a6ea 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetInfoMode.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetInfoMode.java
@@ -9,7 +9,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderSetInfoMode implements BannerModMessage<MessagePatrolLeaderSetInfoMode> {
@@ -30,7 +29,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof AbstractLeaderEntity leader
&& leader.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrolState.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrolState.java
index 0bd45ac2..a1ce638a 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrolState.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrolState.java
@@ -12,7 +12,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderSetPatrolState implements BannerModMessage<MessagePatrolLeaderSetPatrolState> {
@@ -33,7 +32,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
dispatchToServer(player, this.recruit, this.state);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrollingSpeed.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrollingSpeed.java
index 25b6fb79..4ca2896d 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrollingSpeed.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetPatrollingSpeed.java
@@ -9,7 +9,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderSetPatrollingSpeed implements BannerModMessage<MessagePatrolLeaderSetPatrollingSpeed> {
@@ -30,7 +29,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof AbstractLeaderEntity leader
&& RecruitCommandAuthority.canDirectlyControl(player, leader)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetRoute.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetRoute.java
index a3f7799e..82daeab0 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetRoute.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetRoute.java
@@ -14,7 +14,6 @@
import javax.annotation.Nullable;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
/**
@@ -56,7 +55,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
dispatchToServer(player, this.recruit, this.routeId, this.waypoints, this.waitSeconds);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetWaitTime.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetWaitTime.java
index 9fbdb948..f71a69f9 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetWaitTime.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePatrolLeaderSetWaitTime.java
@@ -9,7 +9,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessagePatrolLeaderSetWaitTime implements BannerModMessage<MessagePatrolLeaderSetWaitTime> {
@@ -31,7 +30,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof AbstractLeaderEntity leader
&& RecruitCommandAuthority.canDirectlyControl(player, leader)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePromoteRecruit.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePromoteRecruit.java
index 62f55f07..6f749daf 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePromoteRecruit.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessagePromoteRecruit.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.army.command.RecruitCommandAuthority;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.network.payload.BannerModMessage;
import net.minecraft.network.protocol.PacketFlow;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageProtectEntity.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageProtectEntity.java
index a1acd259..b3b079f3 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageProtectEntity.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageProtectEntity.java
@@ -11,7 +11,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageProtectEntity implements BannerModMessage<MessageProtectEntity> {
@@ -37,7 +36,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
UUID actorUuid = authorizedPlayerUuid(player.getUUID(), this.uuid);
List<AbstractRecruitEntity> recruits = this.group == null
? RecruitIndex.instance().ownerInRange(player.getCommandSenderWorld(), actorUuid, player.position(), 100.0D)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRangedFire.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRangedFire.java
index a73a8ce0..975d46e0 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRangedFire.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRangedFire.java
@@ -12,7 +12,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageRangedFire implements BannerModMessage<MessageRangedFire> {
@@ -36,7 +35,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer sender = Objects.requireNonNull(context.getSender());
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
dispatchToServer(sender, this.player, this.group, this.should);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntity.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntity.java
index ebc15851..ebe4aca8 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntity.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntity.java
@@ -4,6 +4,7 @@
import com.talhanation.bannermod.config.RecruitsServerConfig;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
import com.talhanation.bannermod.war.WarRuntimeContext;
+import com.talhanation.bannermod.war.runtime.ClaimRepublisher;
import com.talhanation.bannermod.war.registry.PoliticalEntityAuthority;
import com.talhanation.bannermod.war.registry.PoliticalEntityRecord;
import com.talhanation.bannermod.war.registry.PoliticalRegistryRuntime;
@@ -79,38 +80,24 @@ public void executeServerSide(BannerModNetworkContext context) {
}
}
- UUID currentOwnerId = existingClaim.getOwnerPoliticalEntityId();
- if (java.util.Objects.equals(currentOwnerId, targetPoliticalEntityId)) {
- sendDenial(sender, "chat.bannermod.claim.transfer.denied.same");
- return;
- }
-
- // Source authority — must be able to edit the existing claim.
- if (!ClaimPacketAuthority.canEditClaim(sender.getUUID(), isAdmin, existingClaim, sourcePeRecord)) {
- sendDenial(sender, "chat.bannermod.claim.transfer.denied.no_source_authority");
- return;
- }
-
- // Target authority — only enforced when not admin and a target PE exists.
- // Detaching to no-state requires admin; non-admin callers must always pick
- // a target PE in which they hold authority.
- if (!isAdmin) {
- if (targetPeRecord == null) {
- sendDenial(sender, "chat.bannermod.claim.transfer.denied.no_target_authority");
- return;
- }
- if (!PoliticalEntityAuthority.canAct(sender.getUUID(), false, targetPeRecord)) {
- String reasonKey = PoliticalEntityAuthority.denialReasonKey(sender.getUUID(), false, targetPeRecord);
- sender.sendSystemMessage(Component.translatable("chat.bannermod.claim.transfer.denied.no_target_authority")
+ TransferResult transferResult = reassignClaimPoliticalEntityAndRepublish(
+ sender.getUUID(),
+ isAdmin,
+ existingClaim,
+ sourcePeRecord,
+ targetPeRecord,
+ targetPoliticalEntityId,
+ claim -> ClaimEvents.claimManager().addOrUpdateClaim(level, claim));
+ if (!transferResult.transferred()) {
+ if (transferResult.denialReasonKey() != null) {
+ sender.sendSystemMessage(Component.translatable(transferResult.denialKey())
.append(Component.literal(" "))
- .append(Component.translatable(reasonKey)));
- return;
+ .append(Component.translatable(transferResult.denialReasonKey())));
+ } else {
+ sendDenial(sender, transferResult.denialKey());
}
+ return;
}
-
- existingClaim.setOwnerPoliticalEntityId(targetPoliticalEntityId);
- ClaimEvents.claimManager().addOrUpdateClaim(level, existingClaim);
-
String targetName = targetPeRecord != null
? targetPeRecord.name()
: Component.translatable("chat.bannermod.claim.transfer.detached").getString();
@@ -125,6 +112,80 @@ private static void sendDenial(ServerPlayer sender, String key) {
sender.sendSystemMessage(Component.translatable(key));
}
+ static TransferResult reassignClaimPoliticalEntity(UUID actorUuid,
+ boolean admin,
+ RecruitsClaim existingClaim,
+ @Nullable PoliticalEntityRecord sourcePeRecord,
+ @Nullable PoliticalEntityRecord targetPeRecord,
+ @Nullable UUID targetPoliticalEntityId) {
+ if (existingClaim == null) {
+ return TransferResult.denied("chat.bannermod.claim.transfer.denied.missing");
+ }
+ if (targetPoliticalEntityId != null && targetPeRecord == null) {
+ return TransferResult.denied("chat.bannermod.claim.transfer.denied.target_missing");
+ }
+ UUID currentOwnerId = existingClaim.getOwnerPoliticalEntityId();
+ if (java.util.Objects.equals(currentOwnerId, targetPoliticalEntityId)) {
+ return TransferResult.denied("chat.bannermod.claim.transfer.denied.same");
+ }
+
+ // Source authority — must be able to edit the existing claim.
+ if (!ClaimPacketAuthority.canEditClaim(actorUuid, admin, existingClaim, sourcePeRecord)) {
+ return TransferResult.denied("chat.bannermod.claim.transfer.denied.no_source_authority");
+ }
+
+ // Target authority — only enforced when not admin and a target PE exists.
+ // Detaching to no-state requires admin; non-admin callers must always pick
+ // a target PE in which they hold authority.
+ if (!admin) {
+ if (targetPeRecord == null) {
+ return TransferResult.denied("chat.bannermod.claim.transfer.denied.no_target_authority");
+ }
+ if (!PoliticalEntityAuthority.canAct(actorUuid, false, targetPeRecord)) {
+ return TransferResult.denied(
+ "chat.bannermod.claim.transfer.denied.no_target_authority",
+ PoliticalEntityAuthority.denialReasonKey(actorUuid, false, targetPeRecord));
+ }
+ }
+
+ existingClaim.setOwnerPoliticalEntityId(targetPoliticalEntityId);
+ return TransferResult.success();
+ }
+
+ static TransferResult reassignClaimPoliticalEntityAndRepublish(UUID actorUuid,
+ boolean admin,
+ RecruitsClaim existingClaim,
+ @Nullable PoliticalEntityRecord sourcePeRecord,
+ @Nullable PoliticalEntityRecord targetPeRecord,
+ @Nullable UUID targetPoliticalEntityId,
+ ClaimRepublisher republisher) {
+ TransferResult result = reassignClaimPoliticalEntity(
+ actorUuid,
+ admin,
+ existingClaim,
+ sourcePeRecord,
+ targetPeRecord,
+ targetPoliticalEntityId);
+ if (result.transferred()) {
+ republisher.republish(existingClaim);
+ }
+ return result;
+ }
+
+ record TransferResult(boolean transferred, @Nullable String denialKey, @Nullable String denialReasonKey) {
+ static TransferResult success() {
+ return new TransferResult(true, null, null);
+ }
+
+ static TransferResult denied(String denialKey) {
+ return denied(denialKey, null);
+ }
+
+ static TransferResult denied(String denialKey, @Nullable String denialReasonKey) {
+ return new TransferResult(false, denialKey, denialReasonKey);
+ }
+ }
+
public MessageReassignClaimPoliticalEntity fromBytes(FriendlyByteBuf buf) {
this.claimUuid = buf.readUUID();
if (buf.readBoolean()) {
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRecruitGui.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRecruitGui.java
index 22d1c451..cee67df3 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRecruitGui.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRecruitGui.java
@@ -8,7 +8,6 @@
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageRecruitGui implements BannerModMessage<MessageRecruitGui> {
@@ -34,7 +33,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
if (!player.getUUID().equals(uuid)) {
return;
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRemoveAssignedGroupFromCompanion.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRemoveAssignedGroupFromCompanion.java
index fee3b848..bf1ca799 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRemoveAssignedGroupFromCompanion.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRemoveAssignedGroupFromCompanion.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.bootstrap.BannerModMain;
import com.talhanation.bannermod.army.command.RecruitCommandAuthority;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractLeaderEntity;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.entity.military.ICompanion;
@@ -38,6 +38,7 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
Entity entity = serverPlayer.serverLevel().getEntity(this.companion);
if (entity instanceof AbstractLeaderEntity companionEntity
&& serverPlayer.getBoundingBox().inflate(100D).intersects(companionEntity.getBoundingBox())
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRest.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRest.java
index 9502dd9a..51ca0938 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRest.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageRest.java
@@ -9,7 +9,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageRest implements BannerModMessage<MessageRest> {
@@ -33,7 +32,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
dispatchToServer(serverPlayer, this.player, this.group, this.should);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageScoutTask.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageScoutTask.java
index c877c87f..54318305 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageScoutTask.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageScoutTask.java
@@ -6,12 +6,12 @@
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageScoutTask implements BannerModMessage<MessageScoutTask> {
@@ -32,7 +32,10 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- dispatchToServer(Objects.requireNonNull(context.getSender()), this.recruit, this.state);
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
+
+ dispatchToServer(sender, this.recruit, this.state);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSelectRecruits.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSelectRecruits.java
index dc2e129e..7303bafe 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSelectRecruits.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSelectRecruits.java
@@ -10,7 +10,6 @@
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.UUID;
@@ -42,7 +41,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Set<UUID> set = new LinkedHashSet<>(this.recruitUuids);
if (this.clearFirst || set.isEmpty()) {
RecruitSelectionService.selectExplicit(player, set, SELECTION_RADIUS);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSendMessenger.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSendMessenger.java
index 793fdadf..b09630e1 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSendMessenger.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSendMessenger.java
@@ -10,7 +10,6 @@
import net.minecraft.world.entity.Entity;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageSendMessenger implements BannerModMessage<MessageSendMessenger> {
@@ -43,7 +42,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof MessengerEntity messenger
&& player.getBoundingBox().inflate(16D).intersects(messenger.getBoundingBox())) {
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSetLeaderGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSetLeaderGroup.java
index fec646c9..e294f544 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSetLeaderGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSetLeaderGroup.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.army.command.RecruitCommandAuthority;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractLeaderEntity;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import com.talhanation.bannermod.network.payload.BannerModMessage;
@@ -12,7 +12,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import javax.annotation.Nullable;
-import java.util.Objects;
import java.util.UUID;
/**
@@ -40,7 +39,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.leaderUUID);
if (!(entity instanceof AbstractLeaderEntity leader)
|| !leader.isAlive()
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageShields.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageShields.java
index 31cc253a..337c3e81 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageShields.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageShields.java
@@ -14,7 +14,6 @@
import java.util.HashSet;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.UUID;
@@ -39,7 +38,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
dispatchToServer(player, this.player, this.group, this.should);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSplitGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSplitGroup.java
index 3b96ed05..c7cd3de6 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSplitGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageSplitGroup.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import com.talhanation.bannermod.network.payload.BannerModMessage;
import net.minecraft.network.protocol.PacketFlow;
@@ -8,7 +8,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageSplitGroup implements BannerModMessage<MessageSplitGroup> {
@@ -28,7 +27,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
RecruitsGroup groupToSplit = RecruitEvents.groupsManager().getGroup(groupUUID);
if(groupToSplit == null) return;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageStrategicFire.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageStrategicFire.java
index 9e70660c..67b81fb9 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageStrategicFire.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageStrategicFire.java
@@ -14,7 +14,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageStrategicFire implements BannerModMessage<MessageStrategicFire> {
@@ -38,7 +37,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer serverPlayer = Objects.requireNonNull(context.getSender());
+ ServerPlayer serverPlayer = context.getSender();
+ if (serverPlayer == null) return;
AABB commandBox = serverPlayer.getBoundingBox().inflate(100);
List<AbstractRecruitEntity> actors = RecruitIndex.instance().groupInRange(
serverPlayer.getCommandSenderWorld(),
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreen.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreen.java
index 2f983492..072ed96d 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreen.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreen.java
@@ -8,7 +8,7 @@
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.RefreshTrigger;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.SnapshotState;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.network.protocol.PacketFlow;
@@ -57,10 +57,10 @@ public MessageToClientUpdateGovernorScreen fromBytes(FriendlyByteBuf buf) {
Payload payload = null;
if (buf.readBoolean()) {
UUID claimUuid = buf.readUUID();
- BannerModSettlementSnapshot settlementSnapshot = null;
+ SettlementSnapshot settlementSnapshot = null;
if (buf.readBoolean()) {
CompoundTag tag = buf.readNbt();
- settlementSnapshot = tag == null ? null : BannerModSettlementSnapshot.fromTag(tag);
+ settlementSnapshot = tag == null ? null : SettlementSnapshot.fromTag(tag);
}
BannerModGovernorSnapshot governorSnapshot = null;
if (buf.readBoolean()) {
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageTransferRoute.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageTransferRoute.java
index 10d5892e..1aa26b6a 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageTransferRoute.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageTransferRoute.java
@@ -9,7 +9,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import com.talhanation.bannermod.network.compat.BannerModPacketDistributor;
-import java.util.Objects;
import java.util.UUID;
import static com.talhanation.bannermod.bootstrap.BannerModMain.SIMPLE_CHANNEL;
@@ -38,7 +37,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer sender = Objects.requireNonNull(context.getSender());
+ ServerPlayer sender = context.getSender();
+ if (sender == null) return;
if (!isRouteTransferPayloadValid(targetPlayerUUID, routeNBT)) return;
ServerPlayer target = sender.getServer().getPlayerList().getPlayer(targetPlayerUUID);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGovernorPolicy.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGovernorPolicy.java
index 57336be6..46e11006 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGovernorPolicy.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGovernorPolicy.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.entity.military.AbstractRecruitEntity;
import com.talhanation.bannermod.governance.BannerModGovernorPolicy;
import com.talhanation.bannermod.network.payload.BannerModMessage;
@@ -9,7 +9,6 @@
import net.minecraft.server.level.ServerPlayer;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageUpdateGovernorPolicy implements BannerModMessage<MessageUpdateGovernorPolicy> {
@@ -34,7 +33,8 @@ public PacketFlow getExecutingSide() {
@Override
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
BannerModGovernorPolicy[] policies = BannerModGovernorPolicy.values();
if (this.policyOrdinal < 0 || this.policyOrdinal >= policies.length) {
return;
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGroup.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGroup.java
index 81abe23e..0f36ecda 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGroup.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpdateGroup.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.events.CommandEvents;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.persistence.military.RecruitsGroup;
import com.talhanation.bannermod.persistence.military.RecruitsGroupsManager;
import com.talhanation.bannermod.network.payload.BannerModMessage;
@@ -31,9 +31,10 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context){
context.enqueueWork(() -> {
- RecruitsGroup updatedGroup = RecruitsGroup.fromNBT(this.groupNBT);
ServerPlayer serverPLayer = context.getSender();
+ if (serverPLayer == null || this.groupNBT == null) return;
+ RecruitsGroup updatedGroup = RecruitsGroup.fromNBT(this.groupNBT);
RecruitEvents.groupsManager().addOrUpdateGroup((ServerLevel) serverPLayer.getCommandSenderWorld(), serverPLayer, updatedGroup);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepEntity.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepEntity.java
index b0641b6a..d464cf22 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepEntity.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepEntity.java
@@ -12,7 +12,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageUpkeepEntity implements BannerModMessage<MessageUpkeepEntity> {
@@ -36,7 +35,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
UUID actorUuid = authorizedPlayerUuid(player.getUUID(), this.player_uuid);
List<AbstractRecruitEntity> recruits = this.group == null
? RecruitIndex.instance().ownerInRange(player.getCommandSenderWorld(), actorUuid, player.position(), 100.0D)
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepPos.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepPos.java
index 4bc13cdc..af621500 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepPos.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageUpkeepPos.java
@@ -12,7 +12,6 @@
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
import java.util.List;
-import java.util.Objects;
import java.util.UUID;
public class MessageUpkeepPos implements BannerModMessage<MessageUpkeepPos> {
@@ -36,7 +35,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
dispatchToServer(player, this.player, this.group, this.pos);
});
}
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageWriteSpawnEgg.java b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageWriteSpawnEgg.java
index 030d1afa..73031ba4 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/military/MessageWriteSpawnEgg.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/military/MessageWriteSpawnEgg.java
@@ -15,7 +15,6 @@
import net.minecraft.world.item.component.CustomData;
import com.talhanation.bannermod.network.compat.BannerModNetworkContext;
-import java.util.Objects;
import java.util.UUID;
public class MessageWriteSpawnEgg implements BannerModMessage<MessageWriteSpawnEgg> {
@@ -35,7 +34,8 @@ public PacketFlow getExecutingSide() {
public void executeServerSide(BannerModNetworkContext context) {
context.enqueueWork(() -> {
- ServerPlayer player = Objects.requireNonNull(context.getSender());
+ ServerPlayer player = context.getSender();
+ if (player == null) return;
Entity entity = player.serverLevel().getEntity(this.recruit);
if (entity instanceof CitizenEntity citizenEntity && citizenEntity.distanceToSqr(player) <= 64.0D * 64.0D) {
writeCitizenSpawnEggToHand(player, citizenEntity, InteractionHand.MAIN_HAND);
diff --git a/src/main/java/com/talhanation/bannermod/network/messages/war/MessageSetPoliticalEntityStatus.java b/src/main/java/com/talhanation/bannermod/network/messages/war/MessageSetPoliticalEntityStatus.java
index 733c9b07..571597de 100644
--- a/src/main/java/com/talhanation/bannermod/network/messages/war/MessageSetPoliticalEntityStatus.java
+++ b/src/main/java/com/talhanation/bannermod/network/messages/war/MessageSetPoliticalEntityStatus.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.network.messages.war;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
+import com.talhanation.bannermod.settlement.SettlementManager;
import com.talhanation.bannermod.war.WarRuntimeContext;
import com.talhanation.bannermod.war.registry.PoliticalEntityAuthority;
import com.talhanation.bannermod.war.registry.PoliticalEntityRecord;
@@ -57,7 +57,7 @@ public void executeServerSide(BannerModNetworkContext context) {
PoliticalEntityStatus status = decodeStatus(this.statusOrdinal);
if (status == PoliticalEntityStatus.STATE && record.status() != PoliticalEntityStatus.STATE) {
PoliticalStatePromotionPolicy.Result promotion = PoliticalStatePromotionPolicy.evaluate(
- BannerModSettlementManager.get(level).getAllSnapshots().stream()
+ SettlementManager.get(level).getAllSnapshots().stream()
.filter(snapshot -> record.id().toString().equals(snapshot.settlementFactionId()))
.findFirst()
.orElse(null));
diff --git a/src/main/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanout.java b/src/main/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanout.java
index d0b0fa4a..7f03f25a 100644
--- a/src/main/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanout.java
+++ b/src/main/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanout.java
@@ -4,7 +4,7 @@
import com.talhanation.bannermod.entity.civilian.workarea.AbstractWorkAreaEntity;
import com.talhanation.bannermod.governance.BannerModGovernorManager;
import com.talhanation.bannermod.governance.BannerModTreasuryManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
+import com.talhanation.bannermod.settlement.SettlementManager;
import com.talhanation.bannermod.war.WarRuntimeContext;
import com.talhanation.bannermod.war.runtime.OccupationRuntime;
import com.talhanation.bannermod.war.runtime.RevoltRuntime;
@@ -54,7 +54,7 @@ public static FanoutResult onClaimRemoved(@Nullable ServerLevel level,
return FanoutResult.empty();
}
BannerModTreasuryManager treasury = BannerModTreasuryManager.get(level);
- BannerModSettlementManager settlements = BannerModSettlementManager.get(level);
+ SettlementManager settlements = SettlementManager.get(level);
BannerModGovernorManager governors = BannerModGovernorManager.get(level);
OccupationRuntime occupations = WarRuntimeContext.occupations(level);
RevoltRuntime revolts = WarRuntimeContext.revolts(level);
@@ -71,7 +71,7 @@ public static FanoutResult onClaimRemoved(@Nullable ServerLevel level,
public static FanoutResult apply(@Nullable UUID claimUuid,
@Nullable List<ChunkPos> claimChunks,
@Nullable BannerModTreasuryManager treasury,
- @Nullable BannerModSettlementManager settlements,
+ @Nullable SettlementManager settlements,
@Nullable BannerModGovernorManager governors,
@Nullable OccupationRuntime occupations,
@Nullable RevoltRuntime revolts,
@@ -87,7 +87,7 @@ public static FanoutResult apply(@Nullable UUID claimUuid,
List<UUID> removedRevolts = List.of();
// Detach worker bindings FIRST. The unbind path triggers a settlement-snapshot
- // refresh through BannerModSettlementService, which would otherwise re-seed the
+ // refresh through SettlementService, which would otherwise re-seed the
// snapshot we are about to drop. Doing this before the snapshot/treasury wipes
// keeps every removal visible in the same tick.
if (workers != null && claimChunks != null && !claimChunks.isEmpty()) {
diff --git a/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsClaimManager.java b/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsClaimManager.java
index 86417714..a7f918b6 100644
--- a/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsClaimManager.java
+++ b/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsClaimManager.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.persistence.military;
-import com.talhanation.bannermod.events.ClaimEvent;
+import com.talhanation.bannermod.api.event.ClaimEvent;
import net.neoforged.neoforge.common.NeoForge;
import com.talhanation.bannermod.bootstrap.BannerModMain;
diff --git a/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPatrolSpawn.java b/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPatrolSpawn.java
index c01c93b9..1283d09d 100644
--- a/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPatrolSpawn.java
+++ b/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPatrolSpawn.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.persistence.military;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.config.RecruitsServerConfig;
import com.talhanation.bannermod.entity.military.*;
import com.talhanation.bannermod.ai.military.villager.FollowCaravanOwner;
diff --git a/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPlayerUnitManager.java b/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPlayerUnitManager.java
index ed7821fd..f68d7a2b 100644
--- a/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPlayerUnitManager.java
+++ b/src/main/java/com/talhanation/bannermod/persistence/military/RecruitsPlayerUnitManager.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.persistence.military;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.config.RecruitsServerConfig;
import com.talhanation.bannermod.network.messages.military.MessageToClientUpdateUnitInfo;
import net.minecraft.server.level.ServerLevel;
diff --git a/src/main/java/com/talhanation/bannermod/registry/ModAttachments.java b/src/main/java/com/talhanation/bannermod/registry/ModAttachments.java
new file mode 100644
index 00000000..197f49c1
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/registry/ModAttachments.java
@@ -0,0 +1,21 @@
+package com.talhanation.bannermod.registry;
+
+import com.talhanation.bannermod.bootstrap.BannerModMain;
+import com.talhanation.bannermod.entity.military.perks.PerkProgress;
+import net.neoforged.neoforge.attachment.AttachmentType;
+import net.neoforged.neoforge.registries.DeferredHolder;
+import net.neoforged.neoforge.registries.DeferredRegister;
+import net.neoforged.neoforge.registries.NeoForgeRegistries;
+
+public final class ModAttachments {
+ public static final DeferredRegister<AttachmentType<?>> ATTACHMENT_TYPES =
+ DeferredRegister.create(NeoForgeRegistries.ATTACHMENT_TYPES, BannerModMain.MOD_ID);
+
+ public static final DeferredHolder<AttachmentType<?>, AttachmentType<PerkProgress>> PLAYER_PERKS =
+ ATTACHMENT_TYPES.register("player_perks", () -> AttachmentType.serializable(PerkProgress::new)
+ .copyOnDeath()
+ .build());
+
+ private ModAttachments() {
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSeed.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSeed.java
deleted file mode 100644
index b007e2ab..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSeed.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public record BannerModSettlementDesiredGoodsSeed(
- List<BannerModSettlementDesiredGoodSeed> desiredGoods
-) {
- public BannerModSettlementDesiredGoodsSeed {
- desiredGoods = List.copyOf(desiredGoods == null ? List.of() : desiredGoods);
- }
-
- public CompoundTag toTag() {
- CompoundTag tag = new CompoundTag();
- ListTag desiredGoodsList = new ListTag();
- for (BannerModSettlementDesiredGoodSeed desiredGood : this.desiredGoods) {
- desiredGoodsList.add(desiredGood.toTag());
- }
- tag.put("DesiredGoods", desiredGoodsList);
- return tag;
- }
-
- public static BannerModSettlementDesiredGoodsSeed fromTag(CompoundTag tag) {
- List<BannerModSettlementDesiredGoodSeed> desiredGoods = new ArrayList<>();
- for (Tag entry : tag.getList("DesiredGoods", Tag.TAG_COMPOUND)) {
- desiredGoods.add(BannerModSettlementDesiredGoodSeed.fromTag((CompoundTag) entry));
- }
- return new BannerModSettlementDesiredGoodsSeed(desiredGoods);
- }
-
- public static BannerModSettlementDesiredGoodsSeed empty() {
- return new BannerModSettlementDesiredGoodsSeed(List.of());
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentJobDefinition.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentJobDefinition.java
deleted file mode 100644
index 347a39db..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentJobDefinition.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-
-import javax.annotation.Nullable;
-import java.util.UUID;
-
-public record BannerModSettlementResidentJobDefinition(
- BannerModSettlementJobHandlerSeed handlerSeed,
- @Nullable UUID targetBuildingUuid,
- @Nullable String targetBuildingTypeId,
- @Nullable BannerModSettlementBuildingCategory targetBuildingCategory,
- @Nullable BannerModSettlementBuildingProfileSeed targetBuildingProfileSeed
-) {
- public CompoundTag toTag() {
- CompoundTag tag = new CompoundTag();
- tag.putString("HandlerSeed", this.handlerSeed.name());
- if (this.targetBuildingUuid != null) {
- tag.putUUID("TargetBuildingUuid", this.targetBuildingUuid);
- }
- if (this.targetBuildingTypeId != null && !this.targetBuildingTypeId.isBlank()) {
- tag.putString("TargetBuildingTypeId", this.targetBuildingTypeId);
- }
- if (this.targetBuildingCategory != null) {
- tag.putString("TargetBuildingCategory", this.targetBuildingCategory.name());
- }
- if (this.targetBuildingProfileSeed != null) {
- tag.putString("TargetBuildingProfileSeed", this.targetBuildingProfileSeed.name());
- }
- return tag;
- }
-
- public static BannerModSettlementResidentJobDefinition fromTag(CompoundTag tag) {
- BannerModSettlementJobHandlerSeed handlerSeed = tag.contains("HandlerSeed", Tag.TAG_STRING)
- ? BannerModSettlementJobHandlerSeed.fromTagName(tag.getString("HandlerSeed"))
- : BannerModSettlementJobHandlerSeed.NONE;
- UUID targetBuildingUuid = tag.hasUUID("TargetBuildingUuid") ? tag.getUUID("TargetBuildingUuid") : null;
- String targetBuildingTypeId = tag.contains("TargetBuildingTypeId", Tag.TAG_STRING)
- ? tag.getString("TargetBuildingTypeId")
- : null;
- BannerModSettlementBuildingCategory targetBuildingCategory = tag.contains("TargetBuildingCategory", Tag.TAG_STRING)
- ? BannerModSettlementBuildingCategory.fromTagName(tag.getString("TargetBuildingCategory"))
- : null;
- BannerModSettlementBuildingProfileSeed targetBuildingProfileSeed = tag.contains("TargetBuildingProfileSeed", Tag.TAG_STRING)
- ? BannerModSettlementBuildingProfileSeed.fromTagName(tag.getString("TargetBuildingProfileSeed"))
- : null;
- return new BannerModSettlementResidentJobDefinition(handlerSeed, targetBuildingUuid, targetBuildingTypeId, targetBuildingCategory, targetBuildingProfileSeed);
- }
-
- public static BannerModSettlementResidentJobDefinition defaultFor(BannerModSettlementResidentRole role,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- @Nullable BannerModSettlementBuildingRecord building) {
- return switch (runtimeRoleSeed) {
- case VILLAGE_LIFE -> new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.VILLAGE_LIFE, null, null, null, null);
- case GOVERNANCE -> new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.GOVERNANCE, null, null, null, null);
- case LOCAL_LABOR -> new BannerModSettlementResidentJobDefinition(
- resolveLocalLaborHandler(role, serviceContract),
- serviceContract.serviceBuildingUuid(),
- resolveBuildingTypeId(serviceContract, building),
- building == null ? null : building.buildingCategory(),
- building == null ? null : building.buildingProfileSeed()
- );
- case FLOATING_LABOR -> new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL, null, null, null, null);
- case ORPHANED_LABOR_ASSIGNMENT -> new BannerModSettlementResidentJobDefinition(
- BannerModSettlementJobHandlerSeed.ORPHANED_LABOR_RECOVERY,
- serviceContract.serviceBuildingUuid(),
- serviceContract.serviceBuildingTypeId(),
- null,
- null
- );
- };
- }
-
- private static BannerModSettlementJobHandlerSeed resolveLocalLaborHandler(BannerModSettlementResidentRole role,
- BannerModSettlementResidentServiceContract serviceContract) {
- if (role == BannerModSettlementResidentRole.CONTROLLED_WORKER
- && serviceContract.actorState() == BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE) {
- return BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR;
- }
- return BannerModSettlementJobHandlerSeed.NONE;
- }
-
- private static String resolveBuildingTypeId(BannerModSettlementResidentServiceContract serviceContract,
- @Nullable BannerModSettlementBuildingRecord building) {
- if (building != null) {
- return building.buildingTypeId();
- }
- return serviceContract.serviceBuildingTypeId();
- }
-
- public static BannerModSettlementResidentJobDefinition none() {
- return new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.NONE, null, null, null, null);
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentJobTargetSelectionSeed.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentJobTargetSelectionSeed.java
deleted file mode 100644
index 8e23f53d..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentJobTargetSelectionSeed.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-
-import javax.annotation.Nullable;
-import java.util.UUID;
-
-public record BannerModSettlementResidentJobTargetSelectionSeed(
- BannerModSettlementJobTargetSelectionMode selectionMode,
- @Nullable UUID targetMarketUuid,
- @Nullable String targetMarketName
-) {
- public CompoundTag toTag() {
- CompoundTag tag = new CompoundTag();
- tag.putString("SelectionMode", this.selectionMode.name());
- if (this.targetMarketUuid != null) {
- tag.putUUID("TargetMarketUuid", this.targetMarketUuid);
- }
- if (this.targetMarketName != null && !this.targetMarketName.isBlank()) {
- tag.putString("TargetMarketName", this.targetMarketName);
- }
- return tag;
- }
-
- public static BannerModSettlementResidentJobTargetSelectionSeed fromTag(CompoundTag tag) {
- BannerModSettlementJobTargetSelectionMode selectionMode = tag.contains("SelectionMode", Tag.TAG_STRING)
- ? BannerModSettlementJobTargetSelectionMode.fromTagName(tag.getString("SelectionMode"))
- : BannerModSettlementJobTargetSelectionMode.NONE;
- UUID targetMarketUuid = tag.hasUUID("TargetMarketUuid") ? tag.getUUID("TargetMarketUuid") : null;
- String targetMarketName = tag.contains("TargetMarketName", Tag.TAG_STRING)
- ? tag.getString("TargetMarketName")
- : null;
- return new BannerModSettlementResidentJobTargetSelectionSeed(selectionMode, targetMarketUuid, targetMarketName);
- }
-
- public static BannerModSettlementResidentJobTargetSelectionSeed defaultFor(UUID residentUuid,
- BannerModSettlementResidentJobDefinition jobDefinition,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementMarketState marketState) {
- BannerModSettlementSellerDispatchRecord sellerDispatch = findSellerDispatch(residentUuid, marketState);
- if (sellerDispatch != null) {
- return new BannerModSettlementResidentJobTargetSelectionSeed(
- sellerDispatch.dispatchState() == BannerModSettlementSellerDispatchState.READY
- ? BannerModSettlementJobTargetSelectionMode.SELLER_MARKET_DISPATCH
- : BannerModSettlementJobTargetSelectionMode.SELLER_MARKET_CLOSED,
- sellerDispatch.marketUuid(),
- sellerDispatch.marketName()
- );
- }
-
- return switch (jobDefinition.handlerSeed()) {
- case LOCAL_BUILDING_LABOR -> serviceContract.actorState() == BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE
- ? new BannerModSettlementResidentJobTargetSelectionSeed(BannerModSettlementJobTargetSelectionMode.SERVICE_BUILDING, null, null)
- : none();
- case FLOATING_LABOR_POOL -> new BannerModSettlementResidentJobTargetSelectionSeed(BannerModSettlementJobTargetSelectionMode.FLOATING_LABOR_POOL, null, null);
- case ORPHANED_LABOR_RECOVERY -> new BannerModSettlementResidentJobTargetSelectionSeed(BannerModSettlementJobTargetSelectionMode.ORPHANED_SERVICE_BUILDING, null, null);
- default -> none();
- };
- }
-
- public static BannerModSettlementResidentJobTargetSelectionSeed none() {
- return new BannerModSettlementResidentJobTargetSelectionSeed(BannerModSettlementJobTargetSelectionMode.NONE, null, null);
- }
-
- @Nullable
- private static BannerModSettlementSellerDispatchRecord findSellerDispatch(UUID residentUuid,
- BannerModSettlementMarketState marketState) {
- for (BannerModSettlementSellerDispatchRecord sellerDispatch : marketState.sellerDispatches()) {
- if (sellerDispatch.residentUuid().equals(residentUuid)) {
- return sellerDispatch;
- }
- }
- return null;
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecord.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecord.java
deleted file mode 100644
index 6ea22702..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecord.java
+++ /dev/null
@@ -1,286 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-
-import javax.annotation.Nullable;
-import java.util.UUID;
-
-public record BannerModSettlementResidentRecord(
- UUID residentUuid,
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementResidentJobDefinition jobDefinition,
- BannerModSettlementResidentJobTargetSelectionSeed jobTargetSelectionSeed,
- BannerModSettlementResidentMode residentMode,
- @Nullable UUID ownerUuid,
- @Nullable String teamId,
- @Nullable UUID boundWorkAreaUuid,
- BannerModSettlementResidentAssignmentState assignmentState,
- BannerModSettlementResidentRoleProfile roleProfile,
- BannerModSettlementResidentSchedulePolicy schedulePolicy
-) {
- public BannerModSettlementResidentRecord(UUID residentUuid,
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementResidentJobDefinition jobDefinition,
- BannerModSettlementResidentJobTargetSelectionSeed jobTargetSelectionSeed,
- BannerModSettlementResidentMode residentMode,
- @Nullable UUID ownerUuid,
- @Nullable String teamId,
- @Nullable UUID boundWorkAreaUuid,
- BannerModSettlementResidentAssignmentState assignmentState,
- BannerModSettlementResidentRoleProfile roleProfile) {
- this(
- residentUuid,
- role,
- scheduleSeed,
- scheduleWindowSeed,
- runtimeRoleSeed,
- serviceContract,
- jobDefinition,
- jobTargetSelectionSeed,
- residentMode,
- ownerUuid,
- teamId,
- boundWorkAreaUuid,
- assignmentState,
- roleProfile,
- BannerModSettlementResidentSchedulePolicy.defaultFor(scheduleSeed, scheduleWindowSeed, runtimeRoleSeed, roleProfile)
- );
- }
-
- public BannerModSettlementResidentRecord(UUID residentUuid,
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementResidentJobDefinition jobDefinition,
- BannerModSettlementResidentJobTargetSelectionSeed jobTargetSelectionSeed,
- BannerModSettlementResidentMode residentMode,
- @Nullable UUID ownerUuid,
- @Nullable String teamId,
- @Nullable UUID boundWorkAreaUuid,
- BannerModSettlementResidentAssignmentState assignmentState) {
- this(
- residentUuid,
- role,
- scheduleSeed,
- scheduleWindowSeed,
- runtimeRoleSeed,
- serviceContract,
- jobDefinition,
- jobTargetSelectionSeed,
- residentMode,
- ownerUuid,
- teamId,
- boundWorkAreaUuid,
- assignmentState,
- BannerModSettlementResidentRoleProfile.defaultFor(role, runtimeRoleSeed, residentMode, assignmentState)
- );
- }
-
- public BannerModSettlementResidentRecord(UUID residentUuid,
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementResidentJobDefinition jobDefinition,
- BannerModSettlementResidentMode residentMode,
- @Nullable UUID ownerUuid,
- @Nullable String teamId,
- @Nullable UUID boundWorkAreaUuid,
- BannerModSettlementResidentAssignmentState assignmentState) {
- this(
- residentUuid,
- role,
- scheduleSeed,
- scheduleWindowSeed,
- runtimeRoleSeed,
- serviceContract,
- jobDefinition,
- BannerModSettlementResidentJobTargetSelectionSeed.defaultFor(residentUuid, jobDefinition, serviceContract, BannerModSettlementMarketState.empty()),
- residentMode,
- ownerUuid,
- teamId,
- boundWorkAreaUuid,
- assignmentState,
- BannerModSettlementResidentRoleProfile.defaultFor(role, runtimeRoleSeed, residentMode, assignmentState)
- );
- }
-
- public BannerModSettlementResidentRecord(UUID residentUuid,
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementResidentMode residentMode,
- @Nullable UUID ownerUuid,
- @Nullable String teamId,
- @Nullable UUID boundWorkAreaUuid,
- BannerModSettlementResidentAssignmentState assignmentState) {
- this(
- residentUuid,
- role,
- scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed.defaultFor(scheduleSeed, runtimeRoleSeed),
- runtimeRoleSeed,
- serviceContract,
- BannerModSettlementResidentJobDefinition.defaultFor(role, runtimeRoleSeed, serviceContract, null),
- BannerModSettlementResidentJobTargetSelectionSeed.defaultFor(
- residentUuid,
- BannerModSettlementResidentJobDefinition.defaultFor(role, runtimeRoleSeed, serviceContract, null),
- serviceContract,
- BannerModSettlementMarketState.empty()
- ),
- residentMode,
- ownerUuid,
- teamId,
- boundWorkAreaUuid,
- assignmentState,
- BannerModSettlementResidentRoleProfile.defaultFor(role, runtimeRoleSeed, residentMode, assignmentState)
- );
- }
-
- public BannerModSettlementResidentRecord(UUID residentUuid,
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentServiceContract serviceContract,
- BannerModSettlementResidentMode residentMode,
- @Nullable UUID ownerUuid,
- @Nullable String teamId,
- @Nullable UUID boundWorkAreaUuid,
- BannerModSettlementResidentAssignmentState assignmentState) {
- this(
- residentUuid,
- role,
- scheduleSeed,
- scheduleWindowSeed,
- runtimeRoleSeed,
- serviceContract,
- BannerModSettlementResidentJobDefinition.defaultFor(role, runtimeRoleSeed, serviceContract, null),
- BannerModSettlementResidentJobTargetSelectionSeed.defaultFor(
- residentUuid,
- BannerModSettlementResidentJobDefinition.defaultFor(role, runtimeRoleSeed, serviceContract, null),
- serviceContract,
- BannerModSettlementMarketState.empty()
- ),
- residentMode,
- ownerUuid,
- teamId,
- boundWorkAreaUuid,
- assignmentState,
- BannerModSettlementResidentRoleProfile.defaultFor(role, runtimeRoleSeed, residentMode, assignmentState)
- );
- }
-
- public CompoundTag toTag() {
- CompoundTag tag = new CompoundTag();
- tag.putUUID("ResidentUuid", this.residentUuid);
- tag.putString("Role", this.role.name());
- tag.putString("ScheduleSeed", this.scheduleSeed.name());
- tag.putString("ScheduleWindowSeed", this.scheduleWindowSeed.name());
- tag.putString("RuntimeRoleSeed", this.runtimeRoleSeed.name());
- tag.put("ServiceContract", this.serviceContract.toTag());
- tag.put("JobDefinition", this.jobDefinition.toTag());
- tag.put("JobTargetSelectionSeed", this.jobTargetSelectionSeed.toTag());
- tag.putString("ResidentMode", this.residentMode.name());
- if (this.ownerUuid != null) {
- tag.putUUID("OwnerUuid", this.ownerUuid);
- }
- if (this.teamId != null && !this.teamId.isBlank()) {
- tag.putString("TeamId", this.teamId);
- }
- if (this.boundWorkAreaUuid != null) {
- tag.putUUID("BoundWorkAreaUuid", this.boundWorkAreaUuid);
- }
- tag.putString("AssignmentState", this.assignmentState.name());
- tag.put("RoleProfile", this.roleProfile.toTag());
- tag.put("SchedulePolicy", this.schedulePolicy.toTag());
- return tag;
- }
-
- public static BannerModSettlementResidentRecord fromTag(CompoundTag tag) {
- BannerModSettlementResidentRole role = BannerModSettlementResidentRole.fromTagName(tag.getString("Role"));
- UUID ownerUuid = tag.hasUUID("OwnerUuid") ? tag.getUUID("OwnerUuid") : null;
- String teamId = tag.contains("TeamId", Tag.TAG_STRING) ? tag.getString("TeamId") : null;
- UUID boundWorkAreaUuid = tag.hasUUID("BoundWorkAreaUuid") ? tag.getUUID("BoundWorkAreaUuid") : null;
- BannerModSettlementResidentScheduleSeed scheduleSeed = tag.contains("ScheduleSeed", Tag.TAG_STRING)
- ? scheduleSeedFromTagName(tag.getString("ScheduleSeed"), role, boundWorkAreaUuid)
- : BannerModSettlementResidentScheduleSeed.defaultFor(role, boundWorkAreaUuid);
- BannerModSettlementResidentMode residentMode = tag.contains("ResidentMode", Tag.TAG_STRING)
- ? BannerModSettlementResidentMode.fromTagName(tag.getString("ResidentMode"))
- : BannerModSettlementResidentMode.defaultFor(role, ownerUuid);
- BannerModSettlementResidentAssignmentState assignmentState = tag.contains("AssignmentState", Tag.TAG_STRING)
- ? BannerModSettlementResidentAssignmentState.fromTagName(tag.getString("AssignmentState"))
- : defaultAssignmentState(role, boundWorkAreaUuid);
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed = tag.contains("RuntimeRoleSeed", Tag.TAG_STRING)
- ? BannerModSettlementResidentRuntimeRoleSeed.fromTagName(tag.getString("RuntimeRoleSeed"))
- : BannerModSettlementResidentRuntimeRoleSeed.defaultFor(role, scheduleSeed, residentMode, assignmentState);
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed = tag.contains("ScheduleWindowSeed", Tag.TAG_STRING)
- ? BannerModSettlementResidentScheduleWindowSeed.fromTagName(tag.getString("ScheduleWindowSeed"))
- : BannerModSettlementResidentScheduleWindowSeed.defaultFor(scheduleSeed, runtimeRoleSeed);
- BannerModSettlementResidentServiceContract serviceContract = tag.contains("ServiceContract", Tag.TAG_COMPOUND)
- ? BannerModSettlementResidentServiceContract.fromTag(tag.getCompound("ServiceContract"))
- : BannerModSettlementResidentServiceContract.defaultFor(role, residentMode, assignmentState, boundWorkAreaUuid, null);
- BannerModSettlementResidentJobDefinition jobDefinition = tag.contains("JobDefinition", Tag.TAG_COMPOUND)
- ? BannerModSettlementResidentJobDefinition.fromTag(tag.getCompound("JobDefinition"))
- : BannerModSettlementResidentJobDefinition.defaultFor(role, runtimeRoleSeed, serviceContract, null);
- BannerModSettlementResidentJobTargetSelectionSeed jobTargetSelectionSeed = tag.contains("JobTargetSelectionSeed", Tag.TAG_COMPOUND)
- ? BannerModSettlementResidentJobTargetSelectionSeed.fromTag(tag.getCompound("JobTargetSelectionSeed"))
- : BannerModSettlementResidentJobTargetSelectionSeed.defaultFor(tag.getUUID("ResidentUuid"), jobDefinition, serviceContract, BannerModSettlementMarketState.empty());
- BannerModSettlementResidentRoleProfile roleProfile = tag.contains("RoleProfile", Tag.TAG_COMPOUND)
- ? BannerModSettlementResidentRoleProfile.fromTag(tag.getCompound("RoleProfile"))
- : BannerModSettlementResidentRoleProfile.defaultFor(role, runtimeRoleSeed, residentMode, assignmentState);
- BannerModSettlementResidentSchedulePolicy schedulePolicy = tag.contains("SchedulePolicy", Tag.TAG_COMPOUND)
- ? BannerModSettlementResidentSchedulePolicy.fromTag(tag.getCompound("SchedulePolicy"))
- : BannerModSettlementResidentSchedulePolicy.defaultFor(scheduleSeed, scheduleWindowSeed, runtimeRoleSeed, roleProfile);
- return new BannerModSettlementResidentRecord(
- tag.getUUID("ResidentUuid"),
- role,
- scheduleSeed,
- scheduleWindowSeed,
- runtimeRoleSeed,
- serviceContract,
- jobDefinition,
- jobTargetSelectionSeed,
- residentMode,
- ownerUuid,
- teamId,
- boundWorkAreaUuid,
- assignmentState,
- roleProfile,
- schedulePolicy
- );
- }
-
- private static BannerModSettlementResidentAssignmentState defaultAssignmentState(BannerModSettlementResidentRole role,
- @Nullable UUID boundWorkAreaUuid) {
- if (role != BannerModSettlementResidentRole.CONTROLLED_WORKER) {
- return BannerModSettlementResidentAssignmentState.NOT_APPLICABLE;
- }
- return boundWorkAreaUuid == null
- ? BannerModSettlementResidentAssignmentState.UNASSIGNED
- : BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
- }
-
- private static BannerModSettlementResidentScheduleSeed scheduleSeedFromTagName(String name,
- BannerModSettlementResidentRole role,
- @Nullable UUID boundWorkAreaUuid) {
- try {
- return BannerModSettlementResidentScheduleSeed.valueOf(name);
- } catch (IllegalArgumentException exception) {
- return BannerModSettlementResidentScheduleSeed.defaultFor(role, boundWorkAreaUuid);
- }
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRuntimeRoleSeed.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRuntimeRoleSeed.java
deleted file mode 100644
index f3397a23..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRuntimeRoleSeed.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-public enum BannerModSettlementResidentRuntimeRoleSeed {
- VILLAGE_LIFE,
- GOVERNANCE,
- LOCAL_LABOR,
- FLOATING_LABOR,
- ORPHANED_LABOR_ASSIGNMENT;
-
- public static BannerModSettlementResidentRuntimeRoleSeed fromTagName(String name) {
- if (name == null || name.isBlank()) {
- return VILLAGE_LIFE;
- }
- try {
- return valueOf(name);
- } catch (IllegalArgumentException ignored) {
- return VILLAGE_LIFE;
- }
- }
-
- public static BannerModSettlementResidentRuntimeRoleSeed defaultFor(BannerModSettlementResidentRole role,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentMode residentMode,
- BannerModSettlementResidentAssignmentState assignmentState) {
- return switch (role) {
- case GOVERNOR_RECRUIT -> GOVERNANCE;
- case VILLAGER -> VILLAGE_LIFE;
- case CONTROLLED_WORKER -> defaultWorkerSeed(scheduleSeed, residentMode, assignmentState);
- };
- }
-
- private static BannerModSettlementResidentRuntimeRoleSeed defaultWorkerSeed(BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentMode residentMode,
- BannerModSettlementResidentAssignmentState assignmentState) {
- if (assignmentState == BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING) {
- return ORPHANED_LABOR_ASSIGNMENT;
- }
- if (assignmentState == BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
- || scheduleSeed == BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK) {
- return LOCAL_LABOR;
- }
- if (residentMode == BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER) {
- return FLOATING_LABOR;
- }
- return FLOATING_LABOR;
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentSchedulePolicy.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentSchedulePolicy.java
deleted file mode 100644
index bd0bdd26..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentSchedulePolicy.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-
-public record BannerModSettlementResidentSchedulePolicy(
- BannerModSettlementResidentSchedulePolicySeed policySeed,
- BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- String goalDomainId,
- boolean prefersLocalBuilding
-) {
- public CompoundTag toTag() {
- CompoundTag tag = new CompoundTag();
- tag.putString("PolicySeed", this.policySeed.name());
- tag.putString("ScheduleSeed", this.scheduleSeed.name());
- tag.putString("ScheduleWindowSeed", this.scheduleWindowSeed.name());
- tag.putString("GoalDomainId", this.goalDomainId);
- tag.putBoolean("PrefersLocalBuilding", this.prefersLocalBuilding);
- return tag;
- }
-
- public static BannerModSettlementResidentSchedulePolicy fromTag(CompoundTag tag) {
- BannerModSettlementResidentSchedulePolicySeed policySeed = tag.contains("PolicySeed", Tag.TAG_STRING)
- ? BannerModSettlementResidentSchedulePolicySeed.fromTagName(tag.getString("PolicySeed"))
- : BannerModSettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX;
- BannerModSettlementResidentScheduleSeed scheduleSeed = tag.contains("ScheduleSeed", Tag.TAG_STRING)
- ? scheduleSeedFromTagName(tag.getString("ScheduleSeed"))
- : BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE;
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed = tag.contains("ScheduleWindowSeed", Tag.TAG_STRING)
- ? BannerModSettlementResidentScheduleWindowSeed.fromTagName(tag.getString("ScheduleWindowSeed"))
- : BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX;
- String goalDomainId = tag.contains("GoalDomainId", Tag.TAG_STRING)
- ? tag.getString("GoalDomainId")
- : "village";
- return new BannerModSettlementResidentSchedulePolicy(
- policySeed,
- scheduleSeed,
- scheduleWindowSeed,
- goalDomainId,
- tag.getBoolean("PrefersLocalBuilding")
- );
- }
-
- public static BannerModSettlementResidentSchedulePolicy defaultFor(BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentRoleProfile roleProfile) {
- return new BannerModSettlementResidentSchedulePolicy(
- defaultPolicySeed(scheduleSeed, scheduleWindowSeed, runtimeRoleSeed),
- scheduleSeed,
- scheduleWindowSeed,
- roleProfile.goalDomainId(),
- roleProfile.prefersLocalBuilding()
- );
- }
-
- private static BannerModSettlementResidentSchedulePolicySeed defaultPolicySeed(BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed) {
- return switch (runtimeRoleSeed) {
- case GOVERNANCE -> BannerModSettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC;
- case LOCAL_LABOR -> BannerModSettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY;
- case FLOATING_LABOR -> scheduleWindowSeed == BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY
- || scheduleSeed == BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK
- ? BannerModSettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY
- : BannerModSettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX;
- case ORPHANED_LABOR_ASSIGNMENT -> BannerModSettlementResidentSchedulePolicySeed.ORPHANED_LABOR_DAY;
- case VILLAGE_LIFE -> scheduleWindowSeed == BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY
- || scheduleSeed == BannerModSettlementResidentScheduleSeed.GOVERNING
- ? BannerModSettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC
- : BannerModSettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX;
- };
- }
-
- private static BannerModSettlementResidentScheduleSeed scheduleSeedFromTagName(String name) {
- try {
- return BannerModSettlementResidentScheduleSeed.valueOf(name);
- } catch (IllegalArgumentException exception) {
- return BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE;
- }
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentStaffingService.java b/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentStaffingService.java
deleted file mode 100644
index b47c1454..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentStaffingService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
-
-final class BannerModSettlementResidentStaffingService {
-
- private BannerModSettlementResidentStaffingService() {
- }
-
- static StaffingResult apply(List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings,
- BannerModSettlementMarketState marketState,
- Set<UUID> localBuildingUuids) {
- List<BannerModSettlementResidentRecord> staffedResidents = BannerModSettlementService.applyResidentAssignmentSemantics(
- residents,
- localBuildingUuids
- );
- staffedResidents = BannerModSettlementService.applyResidentServiceContracts(staffedResidents, buildings);
- staffedResidents = BannerModSettlementService.applyResidentJobDefinitions(staffedResidents, buildings);
- List<BannerModSettlementBuildingRecord> staffedBuildings = BannerModSettlementService.applyAssignedResidents(buildings, staffedResidents);
- BannerModSettlementMarketState staffedMarketState = BannerModSettlementService.applySellerDispatchSeed(
- marketState,
- staffedResidents,
- staffedBuildings
- );
- staffedResidents = BannerModSettlementService.applyResidentJobTargetSelectionSeeds(staffedResidents, staffedMarketState);
- return new StaffingResult(staffedResidents, staffedBuildings, staffedMarketState);
- }
-
- record StaffingResult(List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings,
- BannerModSettlementMarketState marketState) {
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingCategory.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingCategory.java
similarity index 61%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingCategory.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingCategory.java
index 868c6382..fe8d605f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingCategory.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingCategory.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementBuildingCategory {
+public enum SettlementBuildingCategory {
FOOD,
MATERIAL,
STORAGE,
@@ -8,12 +8,12 @@ public enum BannerModSettlementBuildingCategory {
CONSTRUCTION,
GENERAL;
- public static BannerModSettlementBuildingCategory fromTagName(String name) {
+ public static SettlementBuildingCategory fromTagName(String name) {
if (name == null || name.isBlank()) {
return GENERAL;
}
try {
- return BannerModSettlementBuildingCategory.valueOf(name);
+ return SettlementBuildingCategory.valueOf(name);
} catch (IllegalArgumentException exception) {
return GENERAL;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingProfileSeed.java
similarity index 68%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingProfileSeed.java
index d125349d..1a736866 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingProfileSeed.java
@@ -11,25 +11,25 @@
import com.talhanation.bannermod.entity.civilian.workarea.StorageArea;
import net.minecraft.resources.ResourceLocation;
-public enum BannerModSettlementBuildingProfileSeed {
- FOOD_PRODUCTION(BannerModSettlementBuildingCategory.FOOD),
- MATERIAL_PRODUCTION(BannerModSettlementBuildingCategory.MATERIAL),
- STORAGE(BannerModSettlementBuildingCategory.STORAGE),
- MARKET(BannerModSettlementBuildingCategory.MARKET),
- CONSTRUCTION(BannerModSettlementBuildingCategory.CONSTRUCTION),
- GENERAL(BannerModSettlementBuildingCategory.GENERAL);
+public enum SettlementBuildingProfileSeed {
+ FOOD_PRODUCTION(SettlementBuildingCategory.FOOD),
+ MATERIAL_PRODUCTION(SettlementBuildingCategory.MATERIAL),
+ STORAGE(SettlementBuildingCategory.STORAGE),
+ MARKET(SettlementBuildingCategory.MARKET),
+ CONSTRUCTION(SettlementBuildingCategory.CONSTRUCTION),
+ GENERAL(SettlementBuildingCategory.GENERAL);
- private final BannerModSettlementBuildingCategory category;
+ private final SettlementBuildingCategory category;
- BannerModSettlementBuildingProfileSeed(BannerModSettlementBuildingCategory category) {
+ SettlementBuildingProfileSeed(SettlementBuildingCategory category) {
this.category = category;
}
- public BannerModSettlementBuildingCategory category() {
+ public SettlementBuildingCategory category() {
return this.category;
}
- public static BannerModSettlementBuildingProfileSeed fromWorkArea(AbstractWorkAreaEntity workArea) {
+ public static SettlementBuildingProfileSeed fromWorkArea(AbstractWorkAreaEntity workArea) {
if (workArea instanceof CropArea || workArea instanceof AnimalPenArea || workArea instanceof FishingArea) {
return FOOD_PRODUCTION;
}
@@ -48,7 +48,7 @@ public static BannerModSettlementBuildingProfileSeed fromWorkArea(AbstractWorkAr
return GENERAL;
}
- public static BannerModSettlementBuildingProfileSeed fromBuildingTypeId(String buildingTypeId) {
+ public static SettlementBuildingProfileSeed fromBuildingTypeId(String buildingTypeId) {
if (buildingTypeId == null || buildingTypeId.isBlank()) {
return GENERAL;
}
@@ -65,12 +65,12 @@ public static BannerModSettlementBuildingProfileSeed fromBuildingTypeId(String b
};
}
- public static BannerModSettlementBuildingProfileSeed fromTagName(String name) {
+ public static SettlementBuildingProfileSeed fromTagName(String name) {
if (name == null || name.isBlank()) {
return GENERAL;
}
try {
- return BannerModSettlementBuildingProfileSeed.valueOf(name);
+ return SettlementBuildingProfileSeed.valueOf(name);
} catch (IllegalArgumentException exception) {
return GENERAL;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecord.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingRecord.java
similarity index 84%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecord.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingRecord.java
index f463948b..b9057874 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecord.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementBuildingRecord.java
@@ -11,7 +11,7 @@
import java.util.List;
import java.util.UUID;
-public record BannerModSettlementBuildingRecord(
+public record SettlementBuildingRecord(
UUID buildingUuid,
String buildingTypeId,
BlockPos originPos,
@@ -27,10 +27,10 @@ public record BannerModSettlementBuildingRecord(
boolean stockpileRouteAuthored,
boolean stockpilePortEntrypoint,
List<String> stockpileTypeIds,
- BannerModSettlementBuildingCategory buildingCategory,
- BannerModSettlementBuildingProfileSeed buildingProfileSeed
+ SettlementBuildingCategory buildingCategory,
+ SettlementBuildingProfileSeed buildingProfileSeed
) {
- public BannerModSettlementBuildingRecord {
+ public SettlementBuildingRecord {
residentCapacity = Math.max(0, residentCapacity);
workplaceSlots = Math.max(0, workplaceSlots);
assignedWorkerCount = Math.max(0, assignedWorkerCount);
@@ -38,11 +38,11 @@ public record BannerModSettlementBuildingRecord(
stockpileSlotCapacity = Math.max(0, stockpileSlotCapacity);
assignedResidentUuids = List.copyOf(assignedResidentUuids == null ? List.of() : assignedResidentUuids);
stockpileTypeIds = List.copyOf(stockpileTypeIds == null ? List.of() : stockpileTypeIds);
- buildingProfileSeed = buildingProfileSeed == null ? BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId) : buildingProfileSeed;
+ buildingProfileSeed = buildingProfileSeed == null ? SettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId) : buildingProfileSeed;
buildingCategory = buildingCategory == null ? buildingProfileSeed.category() : buildingCategory;
}
- public BannerModSettlementBuildingRecord(UUID buildingUuid,
+ public SettlementBuildingRecord(UUID buildingUuid,
String buildingTypeId,
BlockPos originPos,
@Nullable UUID ownerUuid,
@@ -67,12 +67,12 @@ public BannerModSettlementBuildingRecord(UUID buildingUuid,
false,
false,
List.of(),
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId).category(),
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId)
+ SettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId).category(),
+ SettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId)
);
}
- public BannerModSettlementBuildingRecord(UUID buildingUuid,
+ public SettlementBuildingRecord(UUID buildingUuid,
String buildingTypeId,
BlockPos originPos,
@Nullable UUID ownerUuid,
@@ -103,8 +103,8 @@ public BannerModSettlementBuildingRecord(UUID buildingUuid,
stockpileRouteAuthored,
stockpilePortEntrypoint,
stockpileTypeIds,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId).category(),
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId)
+ SettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId).category(),
+ SettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId)
);
}
@@ -146,14 +146,14 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementBuildingRecord fromTag(CompoundTag tag) {
+ public static SettlementBuildingRecord fromTag(CompoundTag tag) {
UUID ownerUuid = tag.hasUUID("OwnerUuid") ? tag.getUUID("OwnerUuid") : null;
String teamId = tag.contains("TeamId", Tag.TAG_STRING) ? tag.getString("TeamId") : null;
String buildingTypeId = tag.getString("BuildingTypeId");
- BannerModSettlementBuildingProfileSeed profileSeed = tag.contains("BuildingProfileSeed", Tag.TAG_STRING)
- ? BannerModSettlementBuildingProfileSeed.fromTagName(tag.getString("BuildingProfileSeed"))
- : BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId);
- return new BannerModSettlementBuildingRecord(
+ SettlementBuildingProfileSeed profileSeed = tag.contains("BuildingProfileSeed", Tag.TAG_STRING)
+ ? SettlementBuildingProfileSeed.fromTagName(tag.getString("BuildingProfileSeed"))
+ : SettlementBuildingProfileSeed.fromBuildingTypeId(buildingTypeId);
+ return new SettlementBuildingRecord(
tag.getUUID("BuildingUuid"),
buildingTypeId,
BlockPos.of(tag.getLong("OriginPos")),
@@ -170,7 +170,7 @@ public static BannerModSettlementBuildingRecord fromTag(CompoundTag tag) {
tag.getBoolean("StockpilePortEntrypoint"),
readStockpileTypeIds(tag.getList("StockpileTypeIds", Tag.TAG_STRING)),
tag.contains("BuildingCategory", Tag.TAG_STRING)
- ? BannerModSettlementBuildingCategory.fromTagName(tag.getString("BuildingCategory"))
+ ? SettlementBuildingCategory.fromTagName(tag.getString("BuildingCategory"))
: profileSeed.category(),
profileSeed
);
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementClaimTickService.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementClaimTickService.java
similarity index 79%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementClaimTickService.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementClaimTickService.java
index 0a52d3fe..04a08b35 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementClaimTickService.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementClaimTickService.java
@@ -7,14 +7,14 @@
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
import com.talhanation.bannermod.settlement.goal.impl.WorkResidentGoal;
-import com.talhanation.bannermod.settlement.growth.BannerModSettlementGrowthContext;
-import com.talhanation.bannermod.settlement.growth.BannerModSettlementGrowthManager;
+import com.talhanation.bannermod.settlement.growth.SettlementGrowthContext;
+import com.talhanation.bannermod.settlement.growth.SettlementGrowthManager;
import com.talhanation.bannermod.settlement.growth.PendingProject;
import com.talhanation.bannermod.settlement.household.BannerModHomeAssignmentAdvisor;
import com.talhanation.bannermod.settlement.household.BannerModHomeAssignmentRuntime;
import com.talhanation.bannermod.settlement.household.HomePreference;
import com.talhanation.bannermod.settlement.job.JobExecutionContext;
-import com.talhanation.bannermod.settlement.project.BannerModSettlementProjectRuntime;
+import com.talhanation.bannermod.settlement.project.SettlementProjectRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
import net.minecraft.server.level.ServerLevel;
@@ -25,15 +25,15 @@
import java.util.Set;
import java.util.UUID;
-final class BannerModSettlementClaimTickService {
+final class SettlementClaimTickService {
private static final int MAX_GROWTH_QUEUE_SIZE = 3;
- private BannerModSettlementClaimTickService() {
+ private SettlementClaimTickService() {
}
- static void tickSnapshot(BannerModSettlementOrchestrator.LevelRuntimeState state,
- BannerModSettlementSnapshot snapshot,
+ static void tickSnapshot(SettlementOrchestrator.LevelRuntimeState state,
+ SettlementSnapshot snapshot,
@Nullable BannerModGovernorSnapshot governorSnapshot,
@Nullable ServerLevel level,
long gameTime) {
@@ -41,12 +41,12 @@ static void tickSnapshot(BannerModSettlementOrchestrator.LevelRuntimeState state
return;
}
- BannerModSettlementGrowthContext growthContext = BannerModSettlementGrowthContext.fromSnapshot(
+ SettlementGrowthContext growthContext = SettlementGrowthContext.fromSnapshot(
snapshot,
governorSnapshot,
gameTime
);
- List<PendingProject> growthQueue = BannerModSettlementGrowthManager.evaluateGrowthQueue(
+ List<PendingProject> growthQueue = SettlementGrowthManager.evaluateGrowthQueue(
growthContext,
MAX_GROWTH_QUEUE_SIZE
);
@@ -56,7 +56,7 @@ static void tickSnapshot(BannerModSettlementOrchestrator.LevelRuntimeState state
null,
snapshot.claimUuid(),
growthQueue,
- BannerModSettlementProjectRuntime.buildAreaResolver(level),
+ SettlementProjectRuntime.buildAreaResolver(level),
gameTime
);
@@ -65,7 +65,7 @@ static void tickSnapshot(BannerModSettlementOrchestrator.LevelRuntimeState state
tickSellerDispatches(state.sellerRuntime, snapshot.marketState(), gameTime);
publishBuildingWorkOrders(state, snapshot, level, gameTime);
- for (BannerModSettlementResidentRecord resident : snapshot.residents()) {
+ for (SettlementResidentRecord resident : snapshot.residents()) {
if (resident == null || resident.residentUuid() == null) {
continue;
}
@@ -75,14 +75,14 @@ static void tickSnapshot(BannerModSettlementOrchestrator.LevelRuntimeState state
}
}
- private static void publishBuildingWorkOrders(BannerModSettlementOrchestrator.LevelRuntimeState state,
- BannerModSettlementSnapshot snapshot,
+ private static void publishBuildingWorkOrders(SettlementOrchestrator.LevelRuntimeState state,
+ SettlementSnapshot snapshot,
@Nullable ServerLevel level,
long gameTime) {
if (state.publisherRegistry.size() == 0) {
return;
}
- for (BannerModSettlementBuildingRecord building : snapshot.buildings()) {
+ for (SettlementBuildingRecord building : snapshot.buildings()) {
if (building == null || building.buildingUuid() == null) {
continue;
}
@@ -99,9 +99,9 @@ private static void publishBuildingWorkOrders(BannerModSettlementOrchestrator.Le
}
private static void assignHomes(BannerModHomeAssignmentRuntime homeRuntime,
- BannerModSettlementSnapshot snapshot,
+ SettlementSnapshot snapshot,
long gameTime) {
- for (BannerModSettlementResidentRecord resident : snapshot.residents()) {
+ for (SettlementResidentRecord resident : snapshot.residents()) {
if (resident == null || resident.residentUuid() == null || homeRuntime.homeFor(resident.residentUuid()).isPresent()) {
continue;
}
@@ -116,16 +116,16 @@ private static void assignHomes(BannerModHomeAssignmentRuntime homeRuntime,
}
private static void tickSellerDispatches(BannerModSellerDispatchRuntime sellerRuntime,
- BannerModSettlementMarketState marketState,
+ SettlementMarketState marketState,
long gameTime) {
Set<UUID> openMarkets = new HashSet<>();
java.util.Map<UUID, UUID> seededMarketsBySeller = new java.util.LinkedHashMap<>();
- for (BannerModSettlementMarketRecord market : marketState.markets()) {
+ for (SettlementMarketRecord market : marketState.markets()) {
if (market != null && market.open() && market.buildingUuid() != null) {
openMarkets.add(market.buildingUuid());
}
}
- for (BannerModSettlementSellerDispatchRecord seed : marketState.sellerDispatches()) {
+ for (SettlementSellerDispatchRecord seed : marketState.sellerDispatches()) {
if (seed != null && seed.residentUuid() != null && seed.marketUuid() != null) {
seededMarketsBySeller.put(seed.residentUuid(), seed.marketUuid());
}
@@ -144,9 +144,9 @@ private static void tickSellerDispatches(BannerModSellerDispatchRuntime sellerRu
}
}
- for (BannerModSettlementSellerDispatchRecord seed : marketState.sellerDispatches()) {
+ for (SettlementSellerDispatchRecord seed : marketState.sellerDispatches()) {
if (seed == null
- || seed.dispatchState() != BannerModSettlementSellerDispatchState.READY
+ || seed.dispatchState() != SettlementSellerDispatchState.READY
|| seed.residentUuid() == null
|| seed.marketUuid() == null
|| !openMarkets.contains(seed.marketUuid())
@@ -167,9 +167,9 @@ private static void tickSellerDispatches(BannerModSellerDispatchRuntime sellerRu
}
}
- private static void runResidentJobStep(BannerModSettlementOrchestrator.LevelRuntimeState state,
+ private static void runResidentJobStep(SettlementOrchestrator.LevelRuntimeState state,
ResidentGoalContext goalContext) {
- BannerModSettlementResidentRecord resident = goalContext.resident();
+ SettlementResidentRecord resident = goalContext.resident();
if (resident.jobDefinition() == null) {
return;
}
@@ -193,8 +193,8 @@ private static void runResidentJobStep(BannerModSettlementOrchestrator.LevelRunt
});
}
- private static JobExecutionContext jobContext(BannerModSettlementOrchestrator.LevelRuntimeState state,
- BannerModSettlementResidentRecord resident,
+ private static JobExecutionContext jobContext(SettlementOrchestrator.LevelRuntimeState state,
+ SettlementResidentRecord resident,
long gameTime) {
UUID workplaceUuid = resident.jobDefinition() == null || resident.jobDefinition().targetBuildingUuid() == null
? resident.boundWorkAreaUuid()
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementDesiredGoodSnapshot.java
similarity index 75%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementDesiredGoodSnapshot.java
index d27d238a..670a0b5b 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementDesiredGoodSnapshot.java
@@ -3,11 +3,11 @@
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
-public record BannerModSettlementDesiredGoodSeed(
+public record SettlementDesiredGoodSnapshot(
String desiredGoodId,
int driverCount
) {
- public BannerModSettlementDesiredGoodSeed {
+ public SettlementDesiredGoodSnapshot {
desiredGoodId = desiredGoodId == null ? "" : desiredGoodId;
driverCount = Math.max(0, driverCount);
}
@@ -21,8 +21,8 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementDesiredGoodSeed fromTag(CompoundTag tag) {
- return new BannerModSettlementDesiredGoodSeed(
+ public static SettlementDesiredGoodSnapshot fromTag(CompoundTag tag) {
+ return new SettlementDesiredGoodSnapshot(
tag.contains("DesiredGoodId", Tag.TAG_STRING) ? tag.getString("DesiredGoodId") : "",
tag.getInt("DriverCount")
);
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementDesiredGoodsSnapshot.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementDesiredGoodsSnapshot.java
new file mode 100644
index 00000000..68ae5530
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementDesiredGoodsSnapshot.java
@@ -0,0 +1,38 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.Tag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public record SettlementDesiredGoodsSnapshot(
+ List<SettlementDesiredGoodSnapshot> desiredGoods
+) {
+ public SettlementDesiredGoodsSnapshot {
+ desiredGoods = List.copyOf(desiredGoods == null ? List.of() : desiredGoods);
+ }
+
+ public CompoundTag toTag() {
+ CompoundTag tag = new CompoundTag();
+ ListTag desiredGoodsList = new ListTag();
+ for (SettlementDesiredGoodSnapshot desiredGood : this.desiredGoods) {
+ desiredGoodsList.add(desiredGood.toTag());
+ }
+ tag.put("DesiredGoods", desiredGoodsList);
+ return tag;
+ }
+
+ public static SettlementDesiredGoodsSnapshot fromTag(CompoundTag tag) {
+ List<SettlementDesiredGoodSnapshot> desiredGoods = new ArrayList<>();
+ for (Tag entry : tag.getList("DesiredGoods", Tag.TAG_COMPOUND)) {
+ desiredGoods.add(SettlementDesiredGoodSnapshot.fromTag((CompoundTag) entry));
+ }
+ return new SettlementDesiredGoodsSnapshot(desiredGoods);
+ }
+
+ public static SettlementDesiredGoodsSnapshot empty() {
+ return new SettlementDesiredGoodsSnapshot(List.of());
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementJobHandlerSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementJobHandlerSeed.java
similarity index 75%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementJobHandlerSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementJobHandlerSeed.java
index 0b74e6c1..200b694e 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementJobHandlerSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementJobHandlerSeed.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementJobHandlerSeed {
+public enum SettlementJobHandlerSeed {
NONE,
VILLAGE_LIFE,
GOVERNANCE,
@@ -8,7 +8,7 @@ public enum BannerModSettlementJobHandlerSeed {
FLOATING_LABOR_POOL,
ORPHANED_LABOR_RECOVERY;
- public static BannerModSettlementJobHandlerSeed fromTagName(String name) {
+ public static SettlementJobHandlerSeed fromTagName(String name) {
if (name == null || name.isBlank()) {
return NONE;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementJobTargetSelectionMode.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementJobTargetSelectionMode.java
similarity index 74%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementJobTargetSelectionMode.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementJobTargetSelectionMode.java
index 13e13c6c..e7fcf7ad 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementJobTargetSelectionMode.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementJobTargetSelectionMode.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementJobTargetSelectionMode {
+public enum SettlementJobTargetSelectionMode {
NONE,
SERVICE_BUILDING,
SELLER_MARKET_DISPATCH,
@@ -8,7 +8,7 @@ public enum BannerModSettlementJobTargetSelectionMode {
FLOATING_LABOR_POOL,
ORPHANED_SERVICE_BUILDING;
- public static BannerModSettlementJobTargetSelectionMode fromTagName(String name) {
+ public static SettlementJobTargetSelectionMode fromTagName(String name) {
if (name == null || name.isBlank()) {
return NONE;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementLogisticsDerivationService.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementLogisticsDerivationService.java
similarity index 51%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementLogisticsDerivationService.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementLogisticsDerivationService.java
index 2176ebc6..fa0b92eb 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementLogisticsDerivationService.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementLogisticsDerivationService.java
@@ -8,14 +8,14 @@
import java.util.List;
-final class BannerModSettlementLogisticsDerivationService {
+final class SettlementLogisticsDerivationService {
- private BannerModSettlementLogisticsDerivationService() {
+ private SettlementLogisticsDerivationService() {
}
- static LogisticsResult derive(List<BannerModSettlementBuildingRecord> buildings,
- List<BannerModSettlementResidentRecord> residents,
- BannerModSettlementMarketState marketState,
+ static LogisticsResult derive(List<SettlementBuildingRecord> buildings,
+ List<SettlementResidentRecord> residents,
+ SettlementMarketState marketState,
List<BannerModSeaTradeEntrypoint> liveSeaTradeEntrypoints,
List<BannerModLogisticsRoute> localRoutes,
List<BannerModLogisticsReservation> reservations,
@@ -23,36 +23,36 @@ static LogisticsResult derive(List<BannerModSettlementBuildingRecord> buildings,
boolean governedSettlement,
boolean claimedSettlement) {
BannerModSeaTradeSummary.Summary seaTradeSummary = BannerModSeaTradeSummary.summarise(liveSeaTradeEntrypoints);
- BannerModSettlementService.ReservationSignalSeed reservationSignalSeed = BannerModSettlementService.summarizeReservationSignalSeed(
+ SettlementSnapshotRuntime.ReservationSignalSeed reservationSignalSeed = SettlementSnapshotRuntime.summarizeReservationSignalSeed(
buildings,
localRoutes,
reservations
);
- BannerModSettlementStockpileSummary stockpileSummary = BannerModSettlementService.summarizeStockpiles(buildings, liveSeaTradeEntrypoints);
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed = BannerModSettlementService.summarizeDesiredGoods(
+ SettlementStockpileSummary stockpileSummary = SettlementSnapshotRuntime.summarizeStockpiles(buildings, liveSeaTradeEntrypoints);
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot = SettlementSnapshotRuntime.summarizeDesiredGoods(
buildings,
stockpileSummary,
marketState,
seaTradeSummary
);
- BannerModSettlementProjectCandidateSeed projectCandidateSeed = BannerModSettlementService.summarizeProjectCandidate(
+ SettlementProjectCandidateSnapshot projectCandidateSnapshot = SettlementSnapshotRuntime.summarizeProjectCandidate(
buildings,
stockpileSummary,
- desiredGoodsSeed,
+ desiredGoodsSnapshot,
marketState,
governedSettlement,
claimedSettlement
);
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed = BannerModSettlementService.summarizeTradeRouteHandoffSeed(
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot = SettlementSnapshotRuntime.summarizeTradeRouteHandoffSnapshot(
stockpileSummary,
marketState,
- desiredGoodsSeed,
+ desiredGoodsSnapshot,
reservationSignalSeed,
seaTradeSummary,
localSeaTradeExecutions
);
- BannerModSettlementSupplySignalState supplySignalState = BannerModSettlementService.summarizeSupplySignals(
- desiredGoodsSeed,
+ SettlementSupplySignalState supplySignalState = SettlementSnapshotRuntime.summarizeSupplySignals(
+ desiredGoodsSnapshot,
stockpileSummary,
marketState,
residents,
@@ -62,19 +62,19 @@ static LogisticsResult derive(List<BannerModSettlementBuildingRecord> buildings,
);
return new LogisticsResult(
stockpileSummary,
- desiredGoodsSeed,
- projectCandidateSeed,
- tradeRouteHandoffSeed,
+ desiredGoodsSnapshot,
+ projectCandidateSnapshot,
+ tradeRouteHandoffSnapshot,
supplySignalState,
reservationSignalSeed
);
}
- record LogisticsResult(BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
- BannerModSettlementProjectCandidateSeed projectCandidateSeed,
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed,
- BannerModSettlementSupplySignalState supplySignalState,
- BannerModSettlementService.ReservationSignalSeed reservationSignalSeed) {
+ record LogisticsResult(SettlementStockpileSummary stockpileSummary,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
+ SettlementProjectCandidateSnapshot projectCandidateSnapshot,
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot,
+ SettlementSupplySignalState supplySignalState,
+ SettlementSnapshotRuntime.ReservationSignalSeed reservationSignalSeed) {
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementManager.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementManager.java
similarity index 62%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementManager.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementManager.java
index 2e8033a0..28a005c2 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementManager.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementManager.java
@@ -16,24 +16,24 @@
import java.util.Set;
import java.util.UUID;
-public class BannerModSettlementManager extends SavedData {
+public class SettlementManager extends SavedData {
private static final String FILE_ID = "bannermodSettlements";
- private static final SavedData.Factory<BannerModSettlementManager> FACTORY = new SavedData.Factory<>(BannerModSettlementManager::new, BannerModSettlementManager::load);
+ private static final SavedData.Factory<SettlementManager> FACTORY = new SavedData.Factory<>(SettlementManager::new, SettlementManager::load);
private static final int CURRENT_VERSION = 1;
- private final Map<UUID, BannerModSettlementSnapshot> snapshots = new LinkedHashMap<>();
+ private final Map<UUID, SettlementSnapshot> snapshots = new LinkedHashMap<>();
- public static BannerModSettlementManager get(ServerLevel level) {
+ public static SettlementManager get(ServerLevel level) {
return level.getDataStorage().computeIfAbsent(FACTORY, FILE_ID);
}
- public static BannerModSettlementManager load(CompoundTag tag, HolderLookup.Provider registries) {
- SavedDataVersioning.migrate(tag, CURRENT_VERSION, "BannerModSettlementManager");
- BannerModSettlementManager manager = new BannerModSettlementManager();
+ public static SettlementManager load(CompoundTag tag, HolderLookup.Provider registries) {
+ SavedDataVersioning.migrate(tag, CURRENT_VERSION, "SettlementManager");
+ SettlementManager manager = new SettlementManager();
if (tag.contains("Snapshots", Tag.TAG_LIST)) {
ListTag snapshots = tag.getList("Snapshots", Tag.TAG_COMPOUND);
for (Tag entry : snapshots) {
- BannerModSettlementSnapshot snapshot = BannerModSettlementSnapshot.fromTag((CompoundTag) entry);
+ SettlementSnapshot snapshot = SettlementSnapshot.fromTag((CompoundTag) entry);
manager.snapshots.put(snapshot.claimUuid(), snapshot);
}
}
@@ -44,7 +44,7 @@ public static BannerModSettlementManager load(CompoundTag tag, HolderLookup.Prov
public CompoundTag save(CompoundTag tag, HolderLookup.Provider registries) {
SavedDataVersioning.putVersion(tag, CURRENT_VERSION);
ListTag list = new ListTag();
- for (BannerModSettlementSnapshot snapshot : this.snapshots.values()) {
+ for (SettlementSnapshot snapshot : this.snapshots.values()) {
list.add(snapshot.toTag());
}
tag.put("Snapshots", list);
@@ -52,26 +52,26 @@ public CompoundTag save(CompoundTag tag, HolderLookup.Provider registries) {
}
@Nullable
- public BannerModSettlementSnapshot getSnapshot(UUID claimUuid) {
+ public SettlementSnapshot getSnapshot(UUID claimUuid) {
return this.snapshots.get(claimUuid);
}
- public void putSnapshot(BannerModSettlementSnapshot snapshot) {
+ public void putSnapshot(SettlementSnapshot snapshot) {
if (snapshot == null) {
return;
}
- BannerModSettlementSnapshot previous = this.snapshots.put(snapshot.claimUuid(), snapshot);
+ SettlementSnapshot previous = this.snapshots.put(snapshot.claimUuid(), snapshot);
if (!snapshot.equals(previous)) {
this.setDirty();
}
}
@Nullable
- public BannerModSettlementSnapshot removeSnapshot(UUID claimUuid) {
+ public SettlementSnapshot removeSnapshot(UUID claimUuid) {
if (claimUuid == null) {
return null;
}
- BannerModSettlementSnapshot removed = this.snapshots.remove(claimUuid);
+ SettlementSnapshot removed = this.snapshots.remove(claimUuid);
if (removed != null) {
this.setDirty();
}
@@ -91,7 +91,7 @@ public void pruneMissingClaims(Set<UUID> activeClaimUuids) {
}
}
- public Collection<BannerModSettlementSnapshot> getAllSnapshots() {
+ public Collection<SettlementSnapshot> getAllSnapshots() {
return this.snapshots.values();
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementMarketRecord.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementMarketRecord.java
similarity index 84%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementMarketRecord.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementMarketRecord.java
index 39ecdd46..d28ce2eb 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementMarketRecord.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementMarketRecord.java
@@ -5,14 +5,14 @@
import java.util.UUID;
-public record BannerModSettlementMarketRecord(
+public record SettlementMarketRecord(
UUID buildingUuid,
String marketName,
boolean open,
int totalStorageSlots,
int freeStorageSlots
) {
- public BannerModSettlementMarketRecord {
+ public SettlementMarketRecord {
totalStorageSlots = Math.max(0, totalStorageSlots);
freeStorageSlots = Math.max(0, Math.min(freeStorageSlots, totalStorageSlots));
}
@@ -29,9 +29,9 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementMarketRecord fromTag(CompoundTag tag) {
+ public static SettlementMarketRecord fromTag(CompoundTag tag) {
String marketName = tag.contains("MarketName", Tag.TAG_STRING) ? tag.getString("MarketName") : "Market";
- return new BannerModSettlementMarketRecord(
+ return new SettlementMarketRecord(
tag.getUUID("BuildingUuid"),
marketName,
tag.getBoolean("Open"),
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementMarketState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementMarketState.java
similarity index 67%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementMarketState.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementMarketState.java
index c1355322..1e684349 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementMarketState.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementMarketState.java
@@ -7,17 +7,17 @@
import java.util.ArrayList;
import java.util.List;
-public record BannerModSettlementMarketState(
+public record SettlementMarketState(
int marketCount,
int openMarketCount,
int totalStorageSlots,
int freeStorageSlots,
int sellerDispatchCount,
int readySellerDispatchCount,
- List<BannerModSettlementMarketRecord> markets,
- List<BannerModSettlementSellerDispatchRecord> sellerDispatches
+ List<SettlementMarketRecord> markets,
+ List<SettlementSellerDispatchRecord> sellerDispatches
) {
- public BannerModSettlementMarketState {
+ public SettlementMarketState {
marketCount = Math.max(0, marketCount);
openMarketCount = Math.max(0, Math.min(openMarketCount, marketCount));
totalStorageSlots = Math.max(0, totalStorageSlots);
@@ -37,20 +37,20 @@ public CompoundTag toTag() {
tag.putInt("SellerDispatchCount", this.sellerDispatchCount);
tag.putInt("ReadySellerDispatchCount", this.readySellerDispatchCount);
ListTag marketList = new ListTag();
- for (BannerModSettlementMarketRecord market : this.markets) {
+ for (SettlementMarketRecord market : this.markets) {
marketList.add(market.toTag());
}
tag.put("Markets", marketList);
ListTag sellerDispatchList = new ListTag();
- for (BannerModSettlementSellerDispatchRecord sellerDispatch : this.sellerDispatches) {
+ for (SettlementSellerDispatchRecord sellerDispatch : this.sellerDispatches) {
sellerDispatchList.add(sellerDispatch.toTag());
}
tag.put("SellerDispatches", sellerDispatchList);
return tag;
}
- public static BannerModSettlementMarketState fromTag(CompoundTag tag) {
- return new BannerModSettlementMarketState(
+ public static SettlementMarketState fromTag(CompoundTag tag) {
+ return new SettlementMarketState(
tag.getInt("MarketCount"),
tag.getInt("OpenMarketCount"),
tag.getInt("TotalStorageSlots"),
@@ -62,22 +62,22 @@ public static BannerModSettlementMarketState fromTag(CompoundTag tag) {
);
}
- public static BannerModSettlementMarketState empty() {
- return new BannerModSettlementMarketState(0, 0, 0, 0, 0, 0, List.of(), List.of());
+ public static SettlementMarketState empty() {
+ return new SettlementMarketState(0, 0, 0, 0, 0, 0, List.of(), List.of());
}
- private static List<BannerModSettlementMarketRecord> readMarkets(ListTag list) {
- List<BannerModSettlementMarketRecord> markets = new ArrayList<>();
+ private static List<SettlementMarketRecord> readMarkets(ListTag list) {
+ List<SettlementMarketRecord> markets = new ArrayList<>();
for (Tag entry : list) {
- markets.add(BannerModSettlementMarketRecord.fromTag((CompoundTag) entry));
+ markets.add(SettlementMarketRecord.fromTag((CompoundTag) entry));
}
return markets;
}
- private static List<BannerModSettlementSellerDispatchRecord> readSellerDispatches(ListTag list) {
- List<BannerModSettlementSellerDispatchRecord> sellerDispatches = new ArrayList<>();
+ private static List<SettlementSellerDispatchRecord> readSellerDispatches(ListTag list) {
+ List<SettlementSellerDispatchRecord> sellerDispatches = new ArrayList<>();
for (Tag entry : list) {
- sellerDispatches.add(BannerModSettlementSellerDispatchRecord.fromTag((CompoundTag) entry));
+ sellerDispatches.add(SettlementSellerDispatchRecord.fromTag((CompoundTag) entry));
}
return sellerDispatches;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestrator.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementOrchestrator.java
similarity index 83%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestrator.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementOrchestrator.java
index 9710a6ce..6b4b8ee0 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestrator.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementOrchestrator.java
@@ -8,7 +8,7 @@
import com.talhanation.bannermod.settlement.household.BannerModHomeAssignmentRuntime;
import com.talhanation.bannermod.settlement.household.BannerModHomeAssignmentSavedData;
import com.talhanation.bannermod.settlement.job.JobHandlerRegistry;
-import com.talhanation.bannermod.settlement.project.BannerModSettlementProjectRuntime;
+import com.talhanation.bannermod.settlement.project.SettlementProjectRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisherRegistry;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderSavedData;
@@ -24,20 +24,20 @@
import java.util.UUID;
import java.util.WeakHashMap;
-public final class BannerModSettlementOrchestrator {
+public final class SettlementOrchestrator {
private static final WeakHashMap<ServerLevel, LevelRuntimeState> PER_LEVEL = new WeakHashMap<>();
- private BannerModSettlementOrchestrator() {
+ private SettlementOrchestrator() {
}
public static void tick(ServerLevel level,
- BannerModSettlementManager settlementManager,
+ SettlementManager settlementManager,
@Nullable BannerModGovernorManager governorManager) {
tickBatch(level, settlementManager, governorManager, 0, Integer.MAX_VALUE);
}
public static BatchResult tickBatch(ServerLevel level,
- BannerModSettlementManager settlementManager,
+ SettlementManager settlementManager,
@Nullable BannerModGovernorManager governorManager,
int startIndex,
int maxSnapshots) {
@@ -57,7 +57,7 @@ public static BatchResult tickBatch(ServerLevel level,
int clampedStart = Math.max(0, Math.min(startIndex, total));
int endIndex = Math.min(total, clampedStart + maxSnapshots);
for (int i = clampedStart; i < endIndex; i++) {
- BannerModSettlementSnapshot snapshot = settlementManager.getSnapshot(snapshotOrder.get(i));
+ SettlementSnapshot snapshot = settlementManager.getSnapshot(snapshotOrder.get(i));
if (snapshot == null) {
continue;
}
@@ -92,28 +92,28 @@ public static SettlementWorkOrderRuntime workOrderRuntime(ServerLevel level) {
}
static LevelRuntimeState detachedStateForTests(JobHandlerRegistry jobHandlerRegistry) {
- return LevelRuntimeState.create(BannerModSettlementProjectRuntime.detachedForTests(), jobHandlerRegistry);
+ return LevelRuntimeState.create(SettlementProjectRuntime.detachedForTests(), jobHandlerRegistry);
}
static void tickSnapshot(LevelRuntimeState state,
- BannerModSettlementSnapshot snapshot,
+ SettlementSnapshot snapshot,
@Nullable BannerModGovernorSnapshot governorSnapshot,
long gameTime) {
tickSnapshot(state, snapshot, governorSnapshot, null, gameTime);
}
static void tickSnapshot(LevelRuntimeState state,
- BannerModSettlementSnapshot snapshot,
+ SettlementSnapshot snapshot,
@Nullable BannerModGovernorSnapshot governorSnapshot,
@Nullable ServerLevel level,
long gameTime) {
- BannerModSettlementClaimTickService.tickSnapshot(state, snapshot, governorSnapshot, level, gameTime);
+ SettlementClaimTickService.tickSnapshot(state, snapshot, governorSnapshot, level, gameTime);
}
private static synchronized LevelRuntimeState runtimeState(ServerLevel level) {
return PER_LEVEL.computeIfAbsent(level,
ignored -> LevelRuntimeState.create(
- BannerModSettlementProjectRuntime.forServer(level),
+ SettlementProjectRuntime.forServer(level),
JobHandlerRegistry.defaults(),
SettlementWorkOrderSavedData.get(level).runtime(),
BannerModHomeAssignmentSavedData.get(level).runtime(),
@@ -122,7 +122,7 @@ private static synchronized LevelRuntimeState runtimeState(ServerLevel level) {
}
static final class LevelRuntimeState {
- final BannerModSettlementProjectRuntime projectRuntime;
+ final SettlementProjectRuntime projectRuntime;
final BannerModHomeAssignmentRuntime homeRuntime;
final BannerModSellerDispatchRuntime sellerRuntime;
final MutableMarketStateSupplier marketStateSupplier;
@@ -133,7 +133,7 @@ static final class LevelRuntimeState {
final SettlementWorkOrderPublisherRegistry publisherRegistry;
private final List<UUID> orchestratorSnapshotOrder = new ArrayList<>();
- private LevelRuntimeState(BannerModSettlementProjectRuntime projectRuntime,
+ private LevelRuntimeState(SettlementProjectRuntime projectRuntime,
BannerModHomeAssignmentRuntime homeRuntime,
BannerModSellerDispatchRuntime sellerRuntime,
MutableMarketStateSupplier marketStateSupplier,
@@ -153,10 +153,10 @@ private LevelRuntimeState(BannerModSettlementProjectRuntime projectRuntime,
this.publisherRegistry = publisherRegistry;
}
- List<UUID> snapshotOrderForBatch(BannerModSettlementManager settlementManager, int startIndex) {
+ List<UUID> snapshotOrderForBatch(SettlementManager settlementManager, int startIndex) {
if (startIndex <= 0 || this.orchestratorSnapshotOrder.isEmpty()) {
this.orchestratorSnapshotOrder.clear();
- for (BannerModSettlementSnapshot snapshot : settlementManager.getAllSnapshots()) {
+ for (SettlementSnapshot snapshot : settlementManager.getAllSnapshots()) {
if (snapshot != null && snapshot.claimUuid() != null) {
this.orchestratorSnapshotOrder.add(snapshot.claimUuid());
}
@@ -166,20 +166,20 @@ List<UUID> snapshotOrderForBatch(BannerModSettlementManager settlementManager, i
return this.orchestratorSnapshotOrder;
}
- private static LevelRuntimeState create(BannerModSettlementProjectRuntime projectRuntime,
+ private static LevelRuntimeState create(SettlementProjectRuntime projectRuntime,
JobHandlerRegistry jobHandlerRegistry) {
return create(projectRuntime, jobHandlerRegistry, new SettlementWorkOrderRuntime(),
new BannerModHomeAssignmentRuntime(), new BannerModSellerDispatchRuntime());
}
- private static LevelRuntimeState create(BannerModSettlementProjectRuntime projectRuntime,
+ private static LevelRuntimeState create(SettlementProjectRuntime projectRuntime,
JobHandlerRegistry jobHandlerRegistry,
SettlementWorkOrderRuntime workOrderRuntime) {
return create(projectRuntime, jobHandlerRegistry, workOrderRuntime,
new BannerModHomeAssignmentRuntime(), new BannerModSellerDispatchRuntime());
}
- private static LevelRuntimeState create(BannerModSettlementProjectRuntime projectRuntime,
+ private static LevelRuntimeState create(SettlementProjectRuntime projectRuntime,
JobHandlerRegistry jobHandlerRegistry,
SettlementWorkOrderRuntime workOrderRuntime,
BannerModHomeAssignmentRuntime homeRuntime,
@@ -205,16 +205,16 @@ private static LevelRuntimeState create(BannerModSettlementProjectRuntime projec
}
}
- static final class MutableMarketStateSupplier implements java.util.function.Supplier<BannerModSettlementMarketState> {
- private BannerModSettlementMarketState marketState = BannerModSettlementMarketState.empty();
+ static final class MutableMarketStateSupplier implements java.util.function.Supplier<SettlementMarketState> {
+ private SettlementMarketState marketState = SettlementMarketState.empty();
@Override
- public BannerModSettlementMarketState get() {
+ public SettlementMarketState get() {
return this.marketState;
}
- void set(@Nullable BannerModSettlementMarketState marketState) {
- this.marketState = marketState == null ? BannerModSettlementMarketState.empty() : marketState;
+ void set(@Nullable SettlementMarketState marketState) {
+ this.marketState = marketState == null ? SettlementMarketState.empty() : marketState;
}
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementProjectCandidateSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementProjectCandidateSnapshot.java
similarity index 73%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementProjectCandidateSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementProjectCandidateSnapshot.java
index de0d3c8a..09b45151 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementProjectCandidateSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementProjectCandidateSnapshot.java
@@ -9,15 +9,15 @@
import java.util.ArrayList;
import java.util.List;
-public record BannerModSettlementProjectCandidateSeed(
+public record SettlementProjectCandidateSnapshot(
String candidateId,
- @Nullable BannerModSettlementBuildingProfileSeed targetBuildingProfileSeed,
+ @Nullable SettlementBuildingProfileSeed targetBuildingProfileSeed,
int priority,
boolean governedSettlement,
boolean claimedSettlement,
List<String> driverIds
) {
- public BannerModSettlementProjectCandidateSeed {
+ public SettlementProjectCandidateSnapshot {
candidateId = candidateId == null || candidateId.isBlank() ? "none" : candidateId;
priority = Math.max(0, priority);
driverIds = List.copyOf(driverIds == null ? List.of() : driverIds);
@@ -42,11 +42,11 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementProjectCandidateSeed fromTag(CompoundTag tag) {
- BannerModSettlementBuildingProfileSeed targetBuildingProfileSeed = tag.contains("TargetBuildingProfileSeed", Tag.TAG_STRING)
- ? BannerModSettlementBuildingProfileSeed.fromTagName(tag.getString("TargetBuildingProfileSeed"))
+ public static SettlementProjectCandidateSnapshot fromTag(CompoundTag tag) {
+ SettlementBuildingProfileSeed targetBuildingProfileSeed = tag.contains("TargetBuildingProfileSeed", Tag.TAG_STRING)
+ ? SettlementBuildingProfileSeed.fromTagName(tag.getString("TargetBuildingProfileSeed"))
: null;
- return new BannerModSettlementProjectCandidateSeed(
+ return new SettlementProjectCandidateSnapshot(
tag.contains("CandidateId", Tag.TAG_STRING) ? tag.getString("CandidateId") : "none",
targetBuildingProfileSeed,
tag.getInt("Priority"),
@@ -56,8 +56,8 @@ public static BannerModSettlementProjectCandidateSeed fromTag(CompoundTag tag) {
);
}
- public static BannerModSettlementProjectCandidateSeed empty() {
- return new BannerModSettlementProjectCandidateSeed("none", null, 0, false, false, List.of());
+ public static SettlementProjectCandidateSnapshot empty() {
+ return new SettlementProjectCandidateSnapshot("none", null, 0, false, false, List.of());
}
private static List<String> readDriverIds(ListTag list) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentAssignmentState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentAssignmentState.java
similarity index 72%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentAssignmentState.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentAssignmentState.java
index 777cd7c3..66c1ad67 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentAssignmentState.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentAssignmentState.java
@@ -1,12 +1,12 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementResidentAssignmentState {
+public enum SettlementResidentAssignmentState {
NOT_APPLICABLE,
UNASSIGNED,
ASSIGNED_LOCAL_BUILDING,
ASSIGNED_MISSING_BUILDING;
- public static BannerModSettlementResidentAssignmentState fromTagName(String name) {
+ public static SettlementResidentAssignmentState fromTagName(String name) {
if (name == null || name.isBlank()) {
return NOT_APPLICABLE;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentJobDefinition.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentJobDefinition.java
new file mode 100644
index 00000000..1207eb58
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentJobDefinition.java
@@ -0,0 +1,96 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+
+import javax.annotation.Nullable;
+import java.util.UUID;
+
+public record SettlementResidentJobDefinition(
+ SettlementJobHandlerSeed handlerSeed,
+ @Nullable UUID targetBuildingUuid,
+ @Nullable String targetBuildingTypeId,
+ @Nullable SettlementBuildingCategory targetBuildingCategory,
+ @Nullable SettlementBuildingProfileSeed targetBuildingProfileSeed
+) {
+ public CompoundTag toTag() {
+ CompoundTag tag = new CompoundTag();
+ tag.putString("HandlerSeed", this.handlerSeed.name());
+ if (this.targetBuildingUuid != null) {
+ tag.putUUID("TargetBuildingUuid", this.targetBuildingUuid);
+ }
+ if (this.targetBuildingTypeId != null && !this.targetBuildingTypeId.isBlank()) {
+ tag.putString("TargetBuildingTypeId", this.targetBuildingTypeId);
+ }
+ if (this.targetBuildingCategory != null) {
+ tag.putString("TargetBuildingCategory", this.targetBuildingCategory.name());
+ }
+ if (this.targetBuildingProfileSeed != null) {
+ tag.putString("TargetBuildingProfileSeed", this.targetBuildingProfileSeed.name());
+ }
+ return tag;
+ }
+
+ public static SettlementResidentJobDefinition fromTag(CompoundTag tag) {
+ SettlementJobHandlerSeed handlerSeed = tag.contains("HandlerSeed", Tag.TAG_STRING)
+ ? SettlementJobHandlerSeed.fromTagName(tag.getString("HandlerSeed"))
+ : SettlementJobHandlerSeed.NONE;
+ UUID targetBuildingUuid = tag.hasUUID("TargetBuildingUuid") ? tag.getUUID("TargetBuildingUuid") : null;
+ String targetBuildingTypeId = tag.contains("TargetBuildingTypeId", Tag.TAG_STRING)
+ ? tag.getString("TargetBuildingTypeId")
+ : null;
+ SettlementBuildingCategory targetBuildingCategory = tag.contains("TargetBuildingCategory", Tag.TAG_STRING)
+ ? SettlementBuildingCategory.fromTagName(tag.getString("TargetBuildingCategory"))
+ : null;
+ SettlementBuildingProfileSeed targetBuildingProfileSeed = tag.contains("TargetBuildingProfileSeed", Tag.TAG_STRING)
+ ? SettlementBuildingProfileSeed.fromTagName(tag.getString("TargetBuildingProfileSeed"))
+ : null;
+ return new SettlementResidentJobDefinition(handlerSeed, targetBuildingUuid, targetBuildingTypeId, targetBuildingCategory, targetBuildingProfileSeed);
+ }
+
+ public static SettlementResidentJobDefinition defaultFor(SettlementResidentRole role,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ @Nullable SettlementBuildingRecord building) {
+ return switch (runtimeRoleState) {
+ case VILLAGE_LIFE -> new SettlementResidentJobDefinition(SettlementJobHandlerSeed.VILLAGE_LIFE, null, null, null, null);
+ case GOVERNANCE -> new SettlementResidentJobDefinition(SettlementJobHandlerSeed.GOVERNANCE, null, null, null, null);
+ case LOCAL_LABOR -> new SettlementResidentJobDefinition(
+ resolveLocalLaborHandler(role, serviceContract),
+ serviceContract.serviceBuildingUuid(),
+ resolveBuildingTypeId(serviceContract, building),
+ building == null ? null : building.buildingCategory(),
+ building == null ? null : building.buildingProfileSeed()
+ );
+ case FLOATING_LABOR -> new SettlementResidentJobDefinition(SettlementJobHandlerSeed.FLOATING_LABOR_POOL, null, null, null, null);
+ case ORPHANED_LABOR_ASSIGNMENT -> new SettlementResidentJobDefinition(
+ SettlementJobHandlerSeed.ORPHANED_LABOR_RECOVERY,
+ serviceContract.serviceBuildingUuid(),
+ serviceContract.serviceBuildingTypeId(),
+ null,
+ null
+ );
+ };
+ }
+
+ private static SettlementJobHandlerSeed resolveLocalLaborHandler(SettlementResidentRole role,
+ SettlementResidentServiceContract serviceContract) {
+ if (role == SettlementResidentRole.CONTROLLED_WORKER
+ && serviceContract.actorState() == SettlementServiceActorState.LOCAL_BUILDING_SERVICE) {
+ return SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR;
+ }
+ return SettlementJobHandlerSeed.NONE;
+ }
+
+ private static String resolveBuildingTypeId(SettlementResidentServiceContract serviceContract,
+ @Nullable SettlementBuildingRecord building) {
+ if (building != null) {
+ return building.buildingTypeId();
+ }
+ return serviceContract.serviceBuildingTypeId();
+ }
+
+ public static SettlementResidentJobDefinition none() {
+ return new SettlementResidentJobDefinition(SettlementJobHandlerSeed.NONE, null, null, null, null);
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentJobTargetSelectionState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentJobTargetSelectionState.java
new file mode 100644
index 00000000..1face7c1
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentJobTargetSelectionState.java
@@ -0,0 +1,76 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+
+import javax.annotation.Nullable;
+import java.util.UUID;
+
+public record SettlementResidentJobTargetSelectionState(
+ SettlementJobTargetSelectionMode selectionMode,
+ @Nullable UUID targetMarketUuid,
+ @Nullable String targetMarketName
+) {
+ public CompoundTag toTag() {
+ CompoundTag tag = new CompoundTag();
+ tag.putString("SelectionMode", this.selectionMode.name());
+ if (this.targetMarketUuid != null) {
+ tag.putUUID("TargetMarketUuid", this.targetMarketUuid);
+ }
+ if (this.targetMarketName != null && !this.targetMarketName.isBlank()) {
+ tag.putString("TargetMarketName", this.targetMarketName);
+ }
+ return tag;
+ }
+
+ public static SettlementResidentJobTargetSelectionState fromTag(CompoundTag tag) {
+ SettlementJobTargetSelectionMode selectionMode = tag.contains("SelectionMode", Tag.TAG_STRING)
+ ? SettlementJobTargetSelectionMode.fromTagName(tag.getString("SelectionMode"))
+ : SettlementJobTargetSelectionMode.NONE;
+ UUID targetMarketUuid = tag.hasUUID("TargetMarketUuid") ? tag.getUUID("TargetMarketUuid") : null;
+ String targetMarketName = tag.contains("TargetMarketName", Tag.TAG_STRING)
+ ? tag.getString("TargetMarketName")
+ : null;
+ return new SettlementResidentJobTargetSelectionState(selectionMode, targetMarketUuid, targetMarketName);
+ }
+
+ public static SettlementResidentJobTargetSelectionState defaultFor(UUID residentUuid,
+ SettlementResidentJobDefinition jobDefinition,
+ SettlementResidentServiceContract serviceContract,
+ SettlementMarketState marketState) {
+ SettlementSellerDispatchRecord sellerDispatch = findSellerDispatch(residentUuid, marketState);
+ if (sellerDispatch != null) {
+ return new SettlementResidentJobTargetSelectionState(
+ sellerDispatch.dispatchState() == SettlementSellerDispatchState.READY
+ ? SettlementJobTargetSelectionMode.SELLER_MARKET_DISPATCH
+ : SettlementJobTargetSelectionMode.SELLER_MARKET_CLOSED,
+ sellerDispatch.marketUuid(),
+ sellerDispatch.marketName()
+ );
+ }
+
+ return switch (jobDefinition.handlerSeed()) {
+ case LOCAL_BUILDING_LABOR -> serviceContract.actorState() == SettlementServiceActorState.LOCAL_BUILDING_SERVICE
+ ? new SettlementResidentJobTargetSelectionState(SettlementJobTargetSelectionMode.SERVICE_BUILDING, null, null)
+ : none();
+ case FLOATING_LABOR_POOL -> new SettlementResidentJobTargetSelectionState(SettlementJobTargetSelectionMode.FLOATING_LABOR_POOL, null, null);
+ case ORPHANED_LABOR_RECOVERY -> new SettlementResidentJobTargetSelectionState(SettlementJobTargetSelectionMode.ORPHANED_SERVICE_BUILDING, null, null);
+ default -> none();
+ };
+ }
+
+ public static SettlementResidentJobTargetSelectionState none() {
+ return new SettlementResidentJobTargetSelectionState(SettlementJobTargetSelectionMode.NONE, null, null);
+ }
+
+ @Nullable
+ private static SettlementSellerDispatchRecord findSellerDispatch(UUID residentUuid,
+ SettlementMarketState marketState) {
+ for (SettlementSellerDispatchRecord sellerDispatch : marketState.sellerDispatches()) {
+ if (sellerDispatch.residentUuid().equals(residentUuid)) {
+ return sellerDispatch;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentMode.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentMode.java
similarity index 66%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentMode.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentMode.java
index e87fe441..add9ab11 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentMode.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentMode.java
@@ -3,11 +3,11 @@
import javax.annotation.Nullable;
import java.util.UUID;
-public enum BannerModSettlementResidentMode {
+public enum SettlementResidentMode {
SETTLEMENT_RESIDENT,
PROJECTED_CONTROLLED_WORKER;
- public static BannerModSettlementResidentMode fromTagName(@Nullable String name) {
+ public static SettlementResidentMode fromTagName(@Nullable String name) {
if (name == null || name.isBlank()) {
return SETTLEMENT_RESIDENT;
}
@@ -18,9 +18,9 @@ public static BannerModSettlementResidentMode fromTagName(@Nullable String name)
}
}
- public static BannerModSettlementResidentMode defaultFor(BannerModSettlementResidentRole role,
+ public static SettlementResidentMode defaultFor(SettlementResidentRole role,
@Nullable UUID ownerUuid) {
- return role == BannerModSettlementResidentRole.CONTROLLED_WORKER
+ return role == SettlementResidentRole.CONTROLLED_WORKER
? PROJECTED_CONTROLLED_WORKER
: SETTLEMENT_RESIDENT;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRecord.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRecord.java
new file mode 100644
index 00000000..31a71582
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRecord.java
@@ -0,0 +1,286 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+
+import javax.annotation.Nullable;
+import java.util.UUID;
+
+public record SettlementResidentRecord(
+ UUID residentUuid,
+ SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ SettlementResidentJobDefinition jobDefinition,
+ SettlementResidentJobTargetSelectionState jobTargetSelectionState,
+ SettlementResidentMode residentMode,
+ @Nullable UUID ownerUuid,
+ @Nullable String teamId,
+ @Nullable UUID boundWorkAreaUuid,
+ SettlementResidentAssignmentState assignmentState,
+ SettlementResidentRoleProfile roleProfile,
+ SettlementResidentSchedulePolicy schedulePolicy
+) {
+ public SettlementResidentRecord(UUID residentUuid,
+ SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ SettlementResidentJobDefinition jobDefinition,
+ SettlementResidentJobTargetSelectionState jobTargetSelectionState,
+ SettlementResidentMode residentMode,
+ @Nullable UUID ownerUuid,
+ @Nullable String teamId,
+ @Nullable UUID boundWorkAreaUuid,
+ SettlementResidentAssignmentState assignmentState,
+ SettlementResidentRoleProfile roleProfile) {
+ this(
+ residentUuid,
+ role,
+ scheduleSeed,
+ scheduleWindowSeed,
+ runtimeRoleState,
+ serviceContract,
+ jobDefinition,
+ jobTargetSelectionState,
+ residentMode,
+ ownerUuid,
+ teamId,
+ boundWorkAreaUuid,
+ assignmentState,
+ roleProfile,
+ SettlementResidentSchedulePolicy.defaultFor(scheduleSeed, scheduleWindowSeed, runtimeRoleState, roleProfile)
+ );
+ }
+
+ public SettlementResidentRecord(UUID residentUuid,
+ SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ SettlementResidentJobDefinition jobDefinition,
+ SettlementResidentJobTargetSelectionState jobTargetSelectionState,
+ SettlementResidentMode residentMode,
+ @Nullable UUID ownerUuid,
+ @Nullable String teamId,
+ @Nullable UUID boundWorkAreaUuid,
+ SettlementResidentAssignmentState assignmentState) {
+ this(
+ residentUuid,
+ role,
+ scheduleSeed,
+ scheduleWindowSeed,
+ runtimeRoleState,
+ serviceContract,
+ jobDefinition,
+ jobTargetSelectionState,
+ residentMode,
+ ownerUuid,
+ teamId,
+ boundWorkAreaUuid,
+ assignmentState,
+ SettlementResidentRoleProfile.defaultFor(role, runtimeRoleState, residentMode, assignmentState)
+ );
+ }
+
+ public SettlementResidentRecord(UUID residentUuid,
+ SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ SettlementResidentJobDefinition jobDefinition,
+ SettlementResidentMode residentMode,
+ @Nullable UUID ownerUuid,
+ @Nullable String teamId,
+ @Nullable UUID boundWorkAreaUuid,
+ SettlementResidentAssignmentState assignmentState) {
+ this(
+ residentUuid,
+ role,
+ scheduleSeed,
+ scheduleWindowSeed,
+ runtimeRoleState,
+ serviceContract,
+ jobDefinition,
+ SettlementResidentJobTargetSelectionState.defaultFor(residentUuid, jobDefinition, serviceContract, SettlementMarketState.empty()),
+ residentMode,
+ ownerUuid,
+ teamId,
+ boundWorkAreaUuid,
+ assignmentState,
+ SettlementResidentRoleProfile.defaultFor(role, runtimeRoleState, residentMode, assignmentState)
+ );
+ }
+
+ public SettlementResidentRecord(UUID residentUuid,
+ SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ SettlementResidentMode residentMode,
+ @Nullable UUID ownerUuid,
+ @Nullable String teamId,
+ @Nullable UUID boundWorkAreaUuid,
+ SettlementResidentAssignmentState assignmentState) {
+ this(
+ residentUuid,
+ role,
+ scheduleSeed,
+ SettlementResidentScheduleWindowSeed.defaultFor(scheduleSeed, runtimeRoleState),
+ runtimeRoleState,
+ serviceContract,
+ SettlementResidentJobDefinition.defaultFor(role, runtimeRoleState, serviceContract, null),
+ SettlementResidentJobTargetSelectionState.defaultFor(
+ residentUuid,
+ SettlementResidentJobDefinition.defaultFor(role, runtimeRoleState, serviceContract, null),
+ serviceContract,
+ SettlementMarketState.empty()
+ ),
+ residentMode,
+ ownerUuid,
+ teamId,
+ boundWorkAreaUuid,
+ assignmentState,
+ SettlementResidentRoleProfile.defaultFor(role, runtimeRoleState, residentMode, assignmentState)
+ );
+ }
+
+ public SettlementResidentRecord(UUID residentUuid,
+ SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentServiceContract serviceContract,
+ SettlementResidentMode residentMode,
+ @Nullable UUID ownerUuid,
+ @Nullable String teamId,
+ @Nullable UUID boundWorkAreaUuid,
+ SettlementResidentAssignmentState assignmentState) {
+ this(
+ residentUuid,
+ role,
+ scheduleSeed,
+ scheduleWindowSeed,
+ runtimeRoleState,
+ serviceContract,
+ SettlementResidentJobDefinition.defaultFor(role, runtimeRoleState, serviceContract, null),
+ SettlementResidentJobTargetSelectionState.defaultFor(
+ residentUuid,
+ SettlementResidentJobDefinition.defaultFor(role, runtimeRoleState, serviceContract, null),
+ serviceContract,
+ SettlementMarketState.empty()
+ ),
+ residentMode,
+ ownerUuid,
+ teamId,
+ boundWorkAreaUuid,
+ assignmentState,
+ SettlementResidentRoleProfile.defaultFor(role, runtimeRoleState, residentMode, assignmentState)
+ );
+ }
+
+ public CompoundTag toTag() {
+ CompoundTag tag = new CompoundTag();
+ tag.putUUID("ResidentUuid", this.residentUuid);
+ tag.putString("Role", this.role.name());
+ tag.putString("ScheduleSeed", this.scheduleSeed.name());
+ tag.putString("ScheduleWindowSeed", this.scheduleWindowSeed.name());
+ tag.putString("RuntimeRoleSeed", this.runtimeRoleState.name());
+ tag.put("ServiceContract", this.serviceContract.toTag());
+ tag.put("JobDefinition", this.jobDefinition.toTag());
+ tag.put("JobTargetSelectionSeed", this.jobTargetSelectionState.toTag());
+ tag.putString("ResidentMode", this.residentMode.name());
+ if (this.ownerUuid != null) {
+ tag.putUUID("OwnerUuid", this.ownerUuid);
+ }
+ if (this.teamId != null && !this.teamId.isBlank()) {
+ tag.putString("TeamId", this.teamId);
+ }
+ if (this.boundWorkAreaUuid != null) {
+ tag.putUUID("BoundWorkAreaUuid", this.boundWorkAreaUuid);
+ }
+ tag.putString("AssignmentState", this.assignmentState.name());
+ tag.put("RoleProfile", this.roleProfile.toTag());
+ tag.put("SchedulePolicy", this.schedulePolicy.toTag());
+ return tag;
+ }
+
+ public static SettlementResidentRecord fromTag(CompoundTag tag) {
+ SettlementResidentRole role = SettlementResidentRole.fromTagName(tag.getString("Role"));
+ UUID ownerUuid = tag.hasUUID("OwnerUuid") ? tag.getUUID("OwnerUuid") : null;
+ String teamId = tag.contains("TeamId", Tag.TAG_STRING) ? tag.getString("TeamId") : null;
+ UUID boundWorkAreaUuid = tag.hasUUID("BoundWorkAreaUuid") ? tag.getUUID("BoundWorkAreaUuid") : null;
+ SettlementResidentScheduleSeed scheduleSeed = tag.contains("ScheduleSeed", Tag.TAG_STRING)
+ ? scheduleSeedFromTagName(tag.getString("ScheduleSeed"), role, boundWorkAreaUuid)
+ : SettlementResidentScheduleSeed.defaultFor(role, boundWorkAreaUuid);
+ SettlementResidentMode residentMode = tag.contains("ResidentMode", Tag.TAG_STRING)
+ ? SettlementResidentMode.fromTagName(tag.getString("ResidentMode"))
+ : SettlementResidentMode.defaultFor(role, ownerUuid);
+ SettlementResidentAssignmentState assignmentState = tag.contains("AssignmentState", Tag.TAG_STRING)
+ ? SettlementResidentAssignmentState.fromTagName(tag.getString("AssignmentState"))
+ : defaultAssignmentState(role, boundWorkAreaUuid);
+ SettlementResidentRuntimeRoleState runtimeRoleState = tag.contains("RuntimeRoleSeed", Tag.TAG_STRING)
+ ? SettlementResidentRuntimeRoleState.fromTagName(tag.getString("RuntimeRoleSeed"))
+ : SettlementResidentRuntimeRoleState.defaultFor(role, scheduleSeed, residentMode, assignmentState);
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed = tag.contains("ScheduleWindowSeed", Tag.TAG_STRING)
+ ? SettlementResidentScheduleWindowSeed.fromTagName(tag.getString("ScheduleWindowSeed"))
+ : SettlementResidentScheduleWindowSeed.defaultFor(scheduleSeed, runtimeRoleState);
+ SettlementResidentServiceContract serviceContract = tag.contains("ServiceContract", Tag.TAG_COMPOUND)
+ ? SettlementResidentServiceContract.fromTag(tag.getCompound("ServiceContract"))
+ : SettlementResidentServiceContract.defaultFor(role, residentMode, assignmentState, boundWorkAreaUuid, null);
+ SettlementResidentJobDefinition jobDefinition = tag.contains("JobDefinition", Tag.TAG_COMPOUND)
+ ? SettlementResidentJobDefinition.fromTag(tag.getCompound("JobDefinition"))
+ : SettlementResidentJobDefinition.defaultFor(role, runtimeRoleState, serviceContract, null);
+ SettlementResidentJobTargetSelectionState jobTargetSelectionState = tag.contains("JobTargetSelectionSeed", Tag.TAG_COMPOUND)
+ ? SettlementResidentJobTargetSelectionState.fromTag(tag.getCompound("JobTargetSelectionSeed"))
+ : SettlementResidentJobTargetSelectionState.defaultFor(tag.getUUID("ResidentUuid"), jobDefinition, serviceContract, SettlementMarketState.empty());
+ SettlementResidentRoleProfile roleProfile = tag.contains("RoleProfile", Tag.TAG_COMPOUND)
+ ? SettlementResidentRoleProfile.fromTag(tag.getCompound("RoleProfile"))
+ : SettlementResidentRoleProfile.defaultFor(role, runtimeRoleState, residentMode, assignmentState);
+ SettlementResidentSchedulePolicy schedulePolicy = tag.contains("SchedulePolicy", Tag.TAG_COMPOUND)
+ ? SettlementResidentSchedulePolicy.fromTag(tag.getCompound("SchedulePolicy"))
+ : SettlementResidentSchedulePolicy.defaultFor(scheduleSeed, scheduleWindowSeed, runtimeRoleState, roleProfile);
+ return new SettlementResidentRecord(
+ tag.getUUID("ResidentUuid"),
+ role,
+ scheduleSeed,
+ scheduleWindowSeed,
+ runtimeRoleState,
+ serviceContract,
+ jobDefinition,
+ jobTargetSelectionState,
+ residentMode,
+ ownerUuid,
+ teamId,
+ boundWorkAreaUuid,
+ assignmentState,
+ roleProfile,
+ schedulePolicy
+ );
+ }
+
+ private static SettlementResidentAssignmentState defaultAssignmentState(SettlementResidentRole role,
+ @Nullable UUID boundWorkAreaUuid) {
+ if (role != SettlementResidentRole.CONTROLLED_WORKER) {
+ return SettlementResidentAssignmentState.NOT_APPLICABLE;
+ }
+ return boundWorkAreaUuid == null
+ ? SettlementResidentAssignmentState.UNASSIGNED
+ : SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
+ }
+
+ private static SettlementResidentScheduleSeed scheduleSeedFromTagName(String name,
+ SettlementResidentRole role,
+ @Nullable UUID boundWorkAreaUuid) {
+ try {
+ return SettlementResidentScheduleSeed.valueOf(name);
+ } catch (IllegalArgumentException exception) {
+ return SettlementResidentScheduleSeed.defaultFor(role, boundWorkAreaUuid);
+ }
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRole.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRole.java
similarity index 73%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRole.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRole.java
index 3301cea8..211dabdf 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRole.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRole.java
@@ -1,11 +1,11 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementResidentRole {
+public enum SettlementResidentRole {
VILLAGER,
CONTROLLED_WORKER,
GOVERNOR_RECRUIT;
- public static BannerModSettlementResidentRole fromTagName(String name) {
+ public static SettlementResidentRole fromTagName(String name) {
if (name == null || name.isBlank()) {
return VILLAGER;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRoleProfile.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRoleProfile.java
similarity index 52%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRoleProfile.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRoleProfile.java
index b0daa387..232419b0 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRoleProfile.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRoleProfile.java
@@ -2,11 +2,11 @@
import net.minecraft.nbt.CompoundTag;
-public record BannerModSettlementResidentRoleProfile(
- BannerModSettlementResidentRole role,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentMode residentMode,
- BannerModSettlementResidentAssignmentState assignmentState,
+public record SettlementResidentRoleProfile(
+ SettlementResidentRole role,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentMode residentMode,
+ SettlementResidentAssignmentState assignmentState,
String profileId,
String goalDomainId,
boolean prefersLocalBuilding
@@ -14,7 +14,7 @@ public record BannerModSettlementResidentRoleProfile(
public CompoundTag toTag() {
CompoundTag tag = new CompoundTag();
tag.putString("Role", this.role.name());
- tag.putString("RuntimeRoleSeed", this.runtimeRoleSeed.name());
+ tag.putString("RuntimeRoleSeed", this.runtimeRoleState.name());
tag.putString("ResidentMode", this.residentMode.name());
tag.putString("AssignmentState", this.assignmentState.name());
tag.putString("ProfileId", this.profileId);
@@ -23,66 +23,66 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementResidentRoleProfile fromTag(CompoundTag tag) {
- return new BannerModSettlementResidentRoleProfile(
- BannerModSettlementResidentRole.fromTagName(tag.getString("Role")),
- BannerModSettlementResidentRuntimeRoleSeed.fromTagName(tag.getString("RuntimeRoleSeed")),
- BannerModSettlementResidentMode.fromTagName(tag.getString("ResidentMode")),
- BannerModSettlementResidentAssignmentState.fromTagName(tag.getString("AssignmentState")),
+ public static SettlementResidentRoleProfile fromTag(CompoundTag tag) {
+ return new SettlementResidentRoleProfile(
+ SettlementResidentRole.fromTagName(tag.getString("Role")),
+ SettlementResidentRuntimeRoleState.fromTagName(tag.getString("RuntimeRoleSeed")),
+ SettlementResidentMode.fromTagName(tag.getString("ResidentMode")),
+ SettlementResidentAssignmentState.fromTagName(tag.getString("AssignmentState")),
tag.getString("ProfileId"),
tag.getString("GoalDomainId"),
tag.getBoolean("PrefersLocalBuilding")
);
}
- public static BannerModSettlementResidentRoleProfile defaultFor(BannerModSettlementResidentRole role,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed,
- BannerModSettlementResidentMode residentMode,
- BannerModSettlementResidentAssignmentState assignmentState) {
- return switch (runtimeRoleSeed) {
- case VILLAGE_LIFE -> new BannerModSettlementResidentRoleProfile(
+ public static SettlementResidentRoleProfile defaultFor(SettlementResidentRole role,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentMode residentMode,
+ SettlementResidentAssignmentState assignmentState) {
+ return switch (runtimeRoleState) {
+ case VILLAGE_LIFE -> new SettlementResidentRoleProfile(
role,
- runtimeRoleSeed,
+ runtimeRoleState,
residentMode,
assignmentState,
"village_life",
"village",
false
);
- case GOVERNANCE -> new BannerModSettlementResidentRoleProfile(
+ case GOVERNANCE -> new SettlementResidentRoleProfile(
role,
- runtimeRoleSeed,
+ runtimeRoleState,
residentMode,
assignmentState,
"governance",
"governance",
false
);
- case LOCAL_LABOR -> new BannerModSettlementResidentRoleProfile(
+ case LOCAL_LABOR -> new SettlementResidentRoleProfile(
role,
- runtimeRoleSeed,
+ runtimeRoleState,
residentMode,
assignmentState,
- residentMode == BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER
+ residentMode == SettlementResidentMode.PROJECTED_CONTROLLED_WORKER
? "projected_local_labor"
: "local_labor",
"labor",
true
);
- case FLOATING_LABOR -> new BannerModSettlementResidentRoleProfile(
+ case FLOATING_LABOR -> new SettlementResidentRoleProfile(
role,
- runtimeRoleSeed,
+ runtimeRoleState,
residentMode,
assignmentState,
- residentMode == BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER
+ residentMode == SettlementResidentMode.PROJECTED_CONTROLLED_WORKER
? "projected_floating_labor"
: "floating_labor",
"labor",
false
);
- case ORPHANED_LABOR_ASSIGNMENT -> new BannerModSettlementResidentRoleProfile(
+ case ORPHANED_LABOR_ASSIGNMENT -> new SettlementResidentRoleProfile(
role,
- runtimeRoleSeed,
+ runtimeRoleState,
residentMode,
assignmentState,
"orphaned_labor_assignment",
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRuntimeRoleState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRuntimeRoleState.java
new file mode 100644
index 00000000..cc90dee3
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentRuntimeRoleState.java
@@ -0,0 +1,47 @@
+package com.talhanation.bannermod.settlement;
+
+public enum SettlementResidentRuntimeRoleState {
+ VILLAGE_LIFE,
+ GOVERNANCE,
+ LOCAL_LABOR,
+ FLOATING_LABOR,
+ ORPHANED_LABOR_ASSIGNMENT;
+
+ public static SettlementResidentRuntimeRoleState fromTagName(String name) {
+ if (name == null || name.isBlank()) {
+ return VILLAGE_LIFE;
+ }
+ try {
+ return valueOf(name);
+ } catch (IllegalArgumentException ignored) {
+ return VILLAGE_LIFE;
+ }
+ }
+
+ public static SettlementResidentRuntimeRoleState defaultFor(SettlementResidentRole role,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentMode residentMode,
+ SettlementResidentAssignmentState assignmentState) {
+ return switch (role) {
+ case GOVERNOR_RECRUIT -> GOVERNANCE;
+ case VILLAGER -> VILLAGE_LIFE;
+ case CONTROLLED_WORKER -> defaultWorkerState(scheduleSeed, residentMode, assignmentState);
+ };
+ }
+
+ private static SettlementResidentRuntimeRoleState defaultWorkerState(SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentMode residentMode,
+ SettlementResidentAssignmentState assignmentState) {
+ if (assignmentState == SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING) {
+ return ORPHANED_LABOR_ASSIGNMENT;
+ }
+ if (assignmentState == SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ || scheduleSeed == SettlementResidentScheduleSeed.ASSIGNED_WORK) {
+ return LOCAL_LABOR;
+ }
+ if (residentMode == SettlementResidentMode.PROJECTED_CONTROLLED_WORKER) {
+ return FLOATING_LABOR;
+ }
+ return FLOATING_LABOR;
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentSchedulePolicy.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentSchedulePolicy.java
new file mode 100644
index 00000000..d6557e62
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentSchedulePolicy.java
@@ -0,0 +1,83 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+
+public record SettlementResidentSchedulePolicy(
+ SettlementResidentSchedulePolicySeed policySeed,
+ SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ String goalDomainId,
+ boolean prefersLocalBuilding
+) {
+ public CompoundTag toTag() {
+ CompoundTag tag = new CompoundTag();
+ tag.putString("PolicySeed", this.policySeed.name());
+ tag.putString("ScheduleSeed", this.scheduleSeed.name());
+ tag.putString("ScheduleWindowSeed", this.scheduleWindowSeed.name());
+ tag.putString("GoalDomainId", this.goalDomainId);
+ tag.putBoolean("PrefersLocalBuilding", this.prefersLocalBuilding);
+ return tag;
+ }
+
+ public static SettlementResidentSchedulePolicy fromTag(CompoundTag tag) {
+ SettlementResidentSchedulePolicySeed policySeed = tag.contains("PolicySeed", Tag.TAG_STRING)
+ ? SettlementResidentSchedulePolicySeed.fromTagName(tag.getString("PolicySeed"))
+ : SettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX;
+ SettlementResidentScheduleSeed scheduleSeed = tag.contains("ScheduleSeed", Tag.TAG_STRING)
+ ? scheduleSeedFromTagName(tag.getString("ScheduleSeed"))
+ : SettlementResidentScheduleSeed.SETTLEMENT_IDLE;
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed = tag.contains("ScheduleWindowSeed", Tag.TAG_STRING)
+ ? SettlementResidentScheduleWindowSeed.fromTagName(tag.getString("ScheduleWindowSeed"))
+ : SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX;
+ String goalDomainId = tag.contains("GoalDomainId", Tag.TAG_STRING)
+ ? tag.getString("GoalDomainId")
+ : "village";
+ return new SettlementResidentSchedulePolicy(
+ policySeed,
+ scheduleSeed,
+ scheduleWindowSeed,
+ goalDomainId,
+ tag.getBoolean("PrefersLocalBuilding")
+ );
+ }
+
+ public static SettlementResidentSchedulePolicy defaultFor(SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState,
+ SettlementResidentRoleProfile roleProfile) {
+ return new SettlementResidentSchedulePolicy(
+ defaultPolicySeed(scheduleSeed, scheduleWindowSeed, runtimeRoleState),
+ scheduleSeed,
+ scheduleWindowSeed,
+ roleProfile.goalDomainId(),
+ roleProfile.prefersLocalBuilding()
+ );
+ }
+
+ private static SettlementResidentSchedulePolicySeed defaultPolicySeed(SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState) {
+ return switch (runtimeRoleState) {
+ case GOVERNANCE -> SettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC;
+ case LOCAL_LABOR -> SettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY;
+ case FLOATING_LABOR -> scheduleWindowSeed == SettlementResidentScheduleWindowSeed.LABOR_DAY
+ || scheduleSeed == SettlementResidentScheduleSeed.ASSIGNED_WORK
+ ? SettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY
+ : SettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX;
+ case ORPHANED_LABOR_ASSIGNMENT -> SettlementResidentSchedulePolicySeed.ORPHANED_LABOR_DAY;
+ case VILLAGE_LIFE -> scheduleWindowSeed == SettlementResidentScheduleWindowSeed.CIVIC_DAY
+ || scheduleSeed == SettlementResidentScheduleSeed.GOVERNING
+ ? SettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC
+ : SettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX;
+ };
+ }
+
+ private static SettlementResidentScheduleSeed scheduleSeedFromTagName(String name) {
+ try {
+ return SettlementResidentScheduleSeed.valueOf(name);
+ } catch (IllegalArgumentException exception) {
+ return SettlementResidentScheduleSeed.SETTLEMENT_IDLE;
+ }
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentSchedulePolicySeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentSchedulePolicySeed.java
similarity index 55%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentSchedulePolicySeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentSchedulePolicySeed.java
index 843cc068..b27ce462 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentSchedulePolicySeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentSchedulePolicySeed.java
@@ -1,15 +1,15 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementResidentSchedulePolicySeed {
+public enum SettlementResidentSchedulePolicySeed {
VILLAGE_LIFE_FLEX,
GOVERNANCE_CIVIC,
LOCAL_LABOR_DAY,
FLOATING_LABOR_FLEX,
ORPHANED_LABOR_DAY;
- public static BannerModSettlementResidentSchedulePolicySeed fromTagName(String name) {
+ public static SettlementResidentSchedulePolicySeed fromTagName(String name) {
try {
- return BannerModSettlementResidentSchedulePolicySeed.valueOf(name);
+ return SettlementResidentSchedulePolicySeed.valueOf(name);
} catch (IllegalArgumentException exception) {
return VILLAGE_LIFE_FLEX;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentScheduleSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentScheduleSeed.java
similarity index 75%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentScheduleSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentScheduleSeed.java
index 989ab9bf..e77388d4 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentScheduleSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentScheduleSeed.java
@@ -3,12 +3,12 @@
import javax.annotation.Nullable;
import java.util.UUID;
-public enum BannerModSettlementResidentScheduleSeed {
+public enum SettlementResidentScheduleSeed {
SETTLEMENT_IDLE,
ASSIGNED_WORK,
GOVERNING;
- public static BannerModSettlementResidentScheduleSeed defaultFor(BannerModSettlementResidentRole role,
+ public static SettlementResidentScheduleSeed defaultFor(SettlementResidentRole role,
@Nullable UUID boundWorkAreaUuid) {
return switch (role) {
case VILLAGER -> SETTLEMENT_IDLE;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentScheduleWindowSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentScheduleWindowSeed.java
similarity index 57%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentScheduleWindowSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentScheduleWindowSeed.java
index a99a8b23..36ca5930 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentScheduleWindowSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentScheduleWindowSeed.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementResidentScheduleWindowSeed {
+public enum SettlementResidentScheduleWindowSeed {
DAYLIGHT_FLEX(1000, 11000, 12000, 23999),
LABOR_DAY(1000, 9000, 12000, 23999),
CIVIC_DAY(500, 11000, 12000, 23999);
@@ -10,7 +10,7 @@ public enum BannerModSettlementResidentScheduleWindowSeed {
private final int restStartTick;
private final int restEndTick;
- BannerModSettlementResidentScheduleWindowSeed(int activeStartTick,
+ SettlementResidentScheduleWindowSeed(int activeStartTick,
int activeEndTick,
int restStartTick,
int restEndTick) {
@@ -36,23 +36,23 @@ public int restEndTick() {
return this.restEndTick;
}
- public static BannerModSettlementResidentScheduleWindowSeed defaultFor(BannerModSettlementResidentScheduleSeed scheduleSeed,
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed) {
- if (runtimeRoleSeed == BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE
- || scheduleSeed == BannerModSettlementResidentScheduleSeed.GOVERNING) {
+ public static SettlementResidentScheduleWindowSeed defaultFor(SettlementResidentScheduleSeed scheduleSeed,
+ SettlementResidentRuntimeRoleState runtimeRoleState) {
+ if (runtimeRoleState == SettlementResidentRuntimeRoleState.GOVERNANCE
+ || scheduleSeed == SettlementResidentScheduleSeed.GOVERNING) {
return CIVIC_DAY;
}
- if (runtimeRoleSeed == BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR
- || runtimeRoleSeed == BannerModSettlementResidentRuntimeRoleSeed.ORPHANED_LABOR_ASSIGNMENT
- || scheduleSeed == BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK) {
+ if (runtimeRoleState == SettlementResidentRuntimeRoleState.LOCAL_LABOR
+ || runtimeRoleState == SettlementResidentRuntimeRoleState.ORPHANED_LABOR_ASSIGNMENT
+ || scheduleSeed == SettlementResidentScheduleSeed.ASSIGNED_WORK) {
return LABOR_DAY;
}
return DAYLIGHT_FLEX;
}
- public static BannerModSettlementResidentScheduleWindowSeed fromTagName(String name) {
+ public static SettlementResidentScheduleWindowSeed fromTagName(String name) {
try {
- return BannerModSettlementResidentScheduleWindowSeed.valueOf(name);
+ return SettlementResidentScheduleWindowSeed.valueOf(name);
} catch (IllegalArgumentException exception) {
return DAYLIGHT_FLEX;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentServiceContract.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentServiceContract.java
similarity index 51%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentServiceContract.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementResidentServiceContract.java
index bc40c2eb..d2bb26bd 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentServiceContract.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentServiceContract.java
@@ -6,8 +6,8 @@
import javax.annotation.Nullable;
import java.util.UUID;
-public record BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState actorState,
+public record SettlementResidentServiceContract(
+ SettlementServiceActorState actorState,
@Nullable UUID serviceBuildingUuid,
@Nullable String serviceBuildingTypeId
) {
@@ -23,39 +23,39 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementResidentServiceContract fromTag(CompoundTag tag) {
- BannerModSettlementServiceActorState actorState = tag.contains("ActorState", Tag.TAG_STRING)
- ? BannerModSettlementServiceActorState.fromTagName(tag.getString("ActorState"))
- : BannerModSettlementServiceActorState.NOT_SERVICE_ACTOR;
+ public static SettlementResidentServiceContract fromTag(CompoundTag tag) {
+ SettlementServiceActorState actorState = tag.contains("ActorState", Tag.TAG_STRING)
+ ? SettlementServiceActorState.fromTagName(tag.getString("ActorState"))
+ : SettlementServiceActorState.NOT_SERVICE_ACTOR;
UUID serviceBuildingUuid = tag.hasUUID("ServiceBuildingUuid") ? tag.getUUID("ServiceBuildingUuid") : null;
String serviceBuildingTypeId = tag.contains("ServiceBuildingTypeId", Tag.TAG_STRING)
? tag.getString("ServiceBuildingTypeId")
: null;
- return new BannerModSettlementResidentServiceContract(actorState, serviceBuildingUuid, serviceBuildingTypeId);
+ return new SettlementResidentServiceContract(actorState, serviceBuildingUuid, serviceBuildingTypeId);
}
- public static BannerModSettlementResidentServiceContract defaultFor(BannerModSettlementResidentRole role,
- BannerModSettlementResidentMode residentMode,
- BannerModSettlementResidentAssignmentState assignmentState,
+ public static SettlementResidentServiceContract defaultFor(SettlementResidentRole role,
+ SettlementResidentMode residentMode,
+ SettlementResidentAssignmentState assignmentState,
@Nullable UUID boundWorkAreaUuid,
@Nullable String serviceBuildingTypeId) {
- if (role != BannerModSettlementResidentRole.CONTROLLED_WORKER
- || residentMode != BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER) {
+ if (role != SettlementResidentRole.CONTROLLED_WORKER
+ || residentMode != SettlementResidentMode.PROJECTED_CONTROLLED_WORKER) {
return notServiceActor();
}
return switch (assignmentState) {
- case ASSIGNED_LOCAL_BUILDING -> new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE,
+ case ASSIGNED_LOCAL_BUILDING -> new SettlementResidentServiceContract(
+ SettlementServiceActorState.LOCAL_BUILDING_SERVICE,
boundWorkAreaUuid,
serviceBuildingTypeId
);
- case ASSIGNED_MISSING_BUILDING -> new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.ORPHANED_SERVICE,
+ case ASSIGNED_MISSING_BUILDING -> new SettlementResidentServiceContract(
+ SettlementServiceActorState.ORPHANED_SERVICE,
boundWorkAreaUuid,
null
);
- case UNASSIGNED -> new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.FLOATING_SERVICE,
+ case UNASSIGNED -> new SettlementResidentServiceContract(
+ SettlementServiceActorState.FLOATING_SERVICE,
null,
null
);
@@ -63,7 +63,7 @@ public static BannerModSettlementResidentServiceContract defaultFor(BannerModSet
};
}
- public static BannerModSettlementResidentServiceContract notServiceActor() {
- return new BannerModSettlementResidentServiceContract(BannerModSettlementServiceActorState.NOT_SERVICE_ACTOR, null, null);
+ public static SettlementResidentServiceContract notServiceActor() {
+ return new SettlementResidentServiceContract(SettlementServiceActorState.NOT_SERVICE_ACTOR, null, null);
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentStaffingService.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentStaffingService.java
new file mode 100644
index 00000000..ca24648b
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementResidentStaffingService.java
@@ -0,0 +1,36 @@
+package com.talhanation.bannermod.settlement;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+final class SettlementResidentStaffingService {
+
+ private SettlementResidentStaffingService() {
+ }
+
+ static StaffingResult apply(List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings,
+ SettlementMarketState marketState,
+ Set<UUID> localBuildingUuids) {
+ List<SettlementResidentRecord> staffedResidents = SettlementSnapshotRuntime.applyResidentAssignmentSemantics(
+ residents,
+ localBuildingUuids
+ );
+ staffedResidents = SettlementSnapshotRuntime.applyResidentServiceContracts(staffedResidents, buildings);
+ staffedResidents = SettlementSnapshotRuntime.applyResidentJobDefinitions(staffedResidents, buildings);
+ List<SettlementBuildingRecord> staffedBuildings = SettlementSnapshotRuntime.applyAssignedResidents(buildings, staffedResidents);
+ SettlementMarketState staffedMarketState = SettlementSnapshotRuntime.applySellerDispatchSeed(
+ marketState,
+ staffedResidents,
+ staffedBuildings
+ );
+ staffedResidents = SettlementSnapshotRuntime.applyResidentJobTargetSelectionStates(staffedResidents, staffedMarketState);
+ return new StaffingResult(staffedResidents, staffedBuildings, staffedMarketState);
+ }
+
+ record StaffingResult(List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings,
+ SettlementMarketState marketState) {
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSellerDispatchRecord.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSellerDispatchRecord.java
similarity index 66%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSellerDispatchRecord.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSellerDispatchRecord.java
index 7cc6fc67..64bfdef2 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSellerDispatchRecord.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSellerDispatchRecord.java
@@ -6,11 +6,11 @@
import javax.annotation.Nullable;
import java.util.UUID;
-public record BannerModSettlementSellerDispatchRecord(
+public record SettlementSellerDispatchRecord(
UUID residentUuid,
UUID marketUuid,
@Nullable String marketName,
- BannerModSettlementSellerDispatchState dispatchState
+ SettlementSellerDispatchState dispatchState
) {
public CompoundTag toTag() {
CompoundTag tag = new CompoundTag();
@@ -23,22 +23,22 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementSellerDispatchRecord fromTag(CompoundTag tag) {
- return new BannerModSettlementSellerDispatchRecord(
+ public static SettlementSellerDispatchRecord fromTag(CompoundTag tag) {
+ return new SettlementSellerDispatchRecord(
tag.getUUID("ResidentUuid"),
tag.getUUID("MarketUuid"),
tag.contains("MarketName", Tag.TAG_STRING) ? tag.getString("MarketName") : null,
tag.contains("DispatchState", Tag.TAG_STRING)
? dispatchStateFromTagName(tag.getString("DispatchState"))
- : BannerModSettlementSellerDispatchState.READY
+ : SettlementSellerDispatchState.READY
);
}
- private static BannerModSettlementSellerDispatchState dispatchStateFromTagName(String name) {
+ private static SettlementSellerDispatchState dispatchStateFromTagName(String name) {
try {
- return BannerModSettlementSellerDispatchState.valueOf(name);
+ return SettlementSellerDispatchState.valueOf(name);
} catch (IllegalArgumentException exception) {
- return BannerModSettlementSellerDispatchState.READY;
+ return SettlementSellerDispatchState.READY;
}
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSellerDispatchState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSellerDispatchState.java
similarity index 59%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSellerDispatchState.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSellerDispatchState.java
index c3d59ab1..44c6c051 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSellerDispatchState.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSellerDispatchState.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementSellerDispatchState {
+public enum SettlementSellerDispatchState {
READY,
MARKET_CLOSED
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/SettlementService.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementService.java
new file mode 100644
index 00000000..64f9c95f
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementService.java
@@ -0,0 +1,74 @@
+package com.talhanation.bannermod.settlement;
+
+import com.talhanation.bannermod.entity.civilian.AbstractWorkerEntity;
+import com.talhanation.bannermod.entity.civilian.workarea.AbstractWorkAreaEntity;
+import com.talhanation.bannermod.governance.BannerModGovernorManager;
+import com.talhanation.bannermod.persistence.military.RecruitsClaim;
+import com.talhanation.bannermod.persistence.military.RecruitsClaimManager;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
+import com.talhanation.bannermod.settlement.runtime.SettlementClaimBindingService;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.AABB;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+public final class SettlementService {
+ private SettlementService() {
+ }
+
+ public static void refreshAllClaims(ServerLevel level,
+ RecruitsClaimManager claimManager,
+ SettlementManager settlementManager,
+ BannerModGovernorManager governorManager) {
+ SettlementClaimBindingService.refreshAllClaims(level, claimManager, settlementManager, governorManager);
+ }
+
+ public static SettlementClaimBindingService.BatchResult refreshClaimsBatch(ServerLevel level,
+ RecruitsClaimManager claimManager,
+ SettlementManager settlementManager,
+ BannerModGovernorManager governorManager,
+ int startIndex,
+ int maxClaims) {
+ return SettlementClaimBindingService.refreshClaimsBatch(level, claimManager, settlementManager, governorManager, startIndex, maxClaims);
+ }
+
+ public static void refreshClaimAt(ServerLevel level,
+ RecruitsClaimManager claimManager,
+ SettlementManager settlementManager,
+ BannerModGovernorManager governorManager,
+ BlockPos pos) {
+ SettlementClaimBindingService.refreshClaimAt(level, claimManager, settlementManager, governorManager, pos);
+ }
+
+ public static void refreshClaim(ServerLevel level,
+ RecruitsClaimManager claimManager,
+ SettlementManager settlementManager,
+ @Nullable BannerModGovernorManager governorManager,
+ @Nullable RecruitsClaim claim) {
+ SettlementClaimBindingService.refreshClaim(level, claimManager, settlementManager, governorManager, claim);
+ }
+
+ public static SettlementSnapshot buildSnapshot(ServerLevel level,
+ RecruitsClaim claim,
+ @Nullable BannerModGovernorManager governorManager) {
+ return SettlementSnapshotBuilder.buildSnapshot(level, claim, governorManager);
+ }
+
+ public static List<AbstractWorkerEntity> workersInClaim(ServerLevel level, RecruitsClaim claim) {
+ return SettlementSnapshotRuntime.workersInClaim(level, claim);
+ }
+
+ public static Map<UUID, UUID> buildCanonicalWorkAreaBindings(Collection<ValidatedBuildingRecord> validatedBuildings,
+ List<AbstractWorkAreaEntity> workAreas) {
+ return SettlementSnapshotRuntime.buildCanonicalWorkAreaBindings(validatedBuildings, workAreas);
+ }
+
+ public static AABB claimBounds(ServerLevel level, RecruitsClaim claim) {
+ return SettlementSnapshotRuntime.claimBounds(level, claim);
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementServiceActorState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementServiceActorState.java
similarity index 74%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementServiceActorState.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementServiceActorState.java
index 34083ebb..096eca6c 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementServiceActorState.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementServiceActorState.java
@@ -1,12 +1,12 @@
package com.talhanation.bannermod.settlement;
-public enum BannerModSettlementServiceActorState {
+public enum SettlementServiceActorState {
NOT_SERVICE_ACTOR,
LOCAL_BUILDING_SERVICE,
FLOATING_SERVICE,
ORPHANED_SERVICE;
- public static BannerModSettlementServiceActorState fromTagName(String name) {
+ public static SettlementServiceActorState fromTagName(String name) {
if (name == null || name.isBlank()) {
return NOT_SERVICE_ACTOR;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshot.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshot.java
similarity index 52%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshot.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshot.java
index 08fa9ce1..219a1ed3 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshot.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshot.java
@@ -10,7 +10,7 @@
import java.util.List;
import java.util.UUID;
-public record BannerModSettlementSnapshot(
+public record SettlementSnapshot(
UUID claimUuid,
int anchorChunkX,
int anchorChunkZ,
@@ -22,28 +22,28 @@ public record BannerModSettlementSnapshot(
int assignedResidentCount,
int unassignedWorkerCount,
int missingWorkAreaAssignmentCount,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
- BannerModSettlementProjectCandidateSeed projectCandidateSeed,
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed,
- BannerModSettlementSupplySignalState supplySignalState,
- List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
+ SettlementProjectCandidateSnapshot projectCandidateSnapshot,
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot,
+ SettlementSupplySignalState supplySignalState,
+ List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings
) {
- public BannerModSettlementSnapshot {
+ public SettlementSnapshot {
residentCapacity = Math.max(0, residentCapacity);
workplaceCapacity = Math.max(0, workplaceCapacity);
assignedWorkerCount = Math.max(0, assignedWorkerCount);
assignedResidentCount = Math.max(0, assignedResidentCount);
unassignedWorkerCount = Math.max(0, unassignedWorkerCount);
missingWorkAreaAssignmentCount = Math.max(0, missingWorkAreaAssignmentCount);
- stockpileSummary = stockpileSummary == null ? BannerModSettlementStockpileSummary.empty() : stockpileSummary;
- marketState = marketState == null ? BannerModSettlementMarketState.empty() : marketState;
- desiredGoodsSeed = desiredGoodsSeed == null ? BannerModSettlementDesiredGoodsSeed.empty() : desiredGoodsSeed;
- projectCandidateSeed = projectCandidateSeed == null ? BannerModSettlementProjectCandidateSeed.empty() : projectCandidateSeed;
- tradeRouteHandoffSeed = tradeRouteHandoffSeed == null ? BannerModSettlementTradeRouteHandoffSeed.empty() : tradeRouteHandoffSeed;
- supplySignalState = supplySignalState == null ? BannerModSettlementSupplySignalState.empty() : supplySignalState;
+ stockpileSummary = stockpileSummary == null ? SettlementStockpileSummary.empty() : stockpileSummary;
+ marketState = marketState == null ? SettlementMarketState.empty() : marketState;
+ desiredGoodsSnapshot = desiredGoodsSnapshot == null ? SettlementDesiredGoodsSnapshot.empty() : desiredGoodsSnapshot;
+ projectCandidateSnapshot = projectCandidateSnapshot == null ? SettlementProjectCandidateSnapshot.empty() : projectCandidateSnapshot;
+ tradeRouteHandoffSnapshot = tradeRouteHandoffSnapshot == null ? SettlementTradeRouteHandoffSnapshot.empty() : tradeRouteHandoffSnapshot;
+ supplySignalState = supplySignalState == null ? SettlementSupplySignalState.empty() : supplySignalState;
residents = List.copyOf(residents == null ? List.of() : residents);
buildings = List.copyOf(buildings == null ? List.of() : buildings);
}
@@ -69,26 +69,26 @@ public CompoundTag toTag() {
tag.putInt("MissingWorkAreaAssignmentCount", this.missingWorkAreaAssignmentCount);
tag.put("StockpileSummary", this.stockpileSummary.toTag());
tag.put("MarketState", this.marketState.toTag());
- tag.put("DesiredGoodsSeed", this.desiredGoodsSeed.toTag());
- tag.put("ProjectCandidateSeed", this.projectCandidateSeed.toTag());
- tag.put("TradeRouteHandoffSeed", this.tradeRouteHandoffSeed.toTag());
+ tag.put("DesiredGoodsSeed", this.desiredGoodsSnapshot.toTag());
+ tag.put("ProjectCandidateSeed", this.projectCandidateSnapshot.toTag());
+ tag.put("TradeRouteHandoffSeed", this.tradeRouteHandoffSnapshot.toTag());
tag.put("SupplySignalState", this.supplySignalState.toTag());
ListTag residentList = new ListTag();
- for (BannerModSettlementResidentRecord resident : this.residents) {
+ for (SettlementResidentRecord resident : this.residents) {
residentList.add(resident.toTag());
}
tag.put("Residents", residentList);
ListTag buildingList = new ListTag();
- for (BannerModSettlementBuildingRecord building : this.buildings) {
+ for (SettlementBuildingRecord building : this.buildings) {
buildingList.add(building.toTag());
}
tag.put("Buildings", buildingList);
return tag;
}
- public static BannerModSettlementSnapshot fromTag(CompoundTag tag) {
+ public static SettlementSnapshot fromTag(CompoundTag tag) {
String settlementFactionId = tag.contains("SettlementFactionId", Tag.TAG_STRING) ? tag.getString("SettlementFactionId") : null;
- return new BannerModSettlementSnapshot(
+ return new SettlementSnapshot(
tag.getUUID("ClaimUuid"),
tag.getInt("AnchorChunkX"),
tag.getInt("AnchorChunkZ"),
@@ -101,44 +101,44 @@ public static BannerModSettlementSnapshot fromTag(CompoundTag tag) {
tag.getInt("UnassignedWorkerCount"),
tag.getInt("MissingWorkAreaAssignmentCount"),
tag.contains("StockpileSummary", Tag.TAG_COMPOUND)
- ? BannerModSettlementStockpileSummary.fromTag(tag.getCompound("StockpileSummary"))
- : BannerModSettlementStockpileSummary.empty(),
+ ? SettlementStockpileSummary.fromTag(tag.getCompound("StockpileSummary"))
+ : SettlementStockpileSummary.empty(),
tag.contains("MarketState", Tag.TAG_COMPOUND)
- ? BannerModSettlementMarketState.fromTag(tag.getCompound("MarketState"))
- : BannerModSettlementMarketState.empty(),
+ ? SettlementMarketState.fromTag(tag.getCompound("MarketState"))
+ : SettlementMarketState.empty(),
tag.contains("DesiredGoodsSeed", Tag.TAG_COMPOUND)
- ? BannerModSettlementDesiredGoodsSeed.fromTag(tag.getCompound("DesiredGoodsSeed"))
- : BannerModSettlementDesiredGoodsSeed.empty(),
+ ? SettlementDesiredGoodsSnapshot.fromTag(tag.getCompound("DesiredGoodsSeed"))
+ : SettlementDesiredGoodsSnapshot.empty(),
tag.contains("ProjectCandidateSeed", Tag.TAG_COMPOUND)
- ? BannerModSettlementProjectCandidateSeed.fromTag(tag.getCompound("ProjectCandidateSeed"))
- : BannerModSettlementProjectCandidateSeed.empty(),
+ ? SettlementProjectCandidateSnapshot.fromTag(tag.getCompound("ProjectCandidateSeed"))
+ : SettlementProjectCandidateSnapshot.empty(),
tag.contains("TradeRouteHandoffSeed", Tag.TAG_COMPOUND)
- ? BannerModSettlementTradeRouteHandoffSeed.fromTag(tag.getCompound("TradeRouteHandoffSeed"))
- : BannerModSettlementTradeRouteHandoffSeed.empty(),
+ ? SettlementTradeRouteHandoffSnapshot.fromTag(tag.getCompound("TradeRouteHandoffSeed"))
+ : SettlementTradeRouteHandoffSnapshot.empty(),
tag.contains("SupplySignalState", Tag.TAG_COMPOUND)
- ? BannerModSettlementSupplySignalState.fromTag(tag.getCompound("SupplySignalState"))
- : BannerModSettlementSupplySignalState.empty(),
+ ? SettlementSupplySignalState.fromTag(tag.getCompound("SupplySignalState"))
+ : SettlementSupplySignalState.empty(),
readResidents(tag.getList("Residents", Tag.TAG_COMPOUND)),
readBuildings(tag.getList("Buildings", Tag.TAG_COMPOUND))
);
}
- public static BannerModSettlementSnapshot create(UUID claimUuid, ChunkPos anchorChunk, @Nullable String settlementFactionId) {
- return new BannerModSettlementSnapshot(claimUuid, anchorChunk.x, anchorChunk.z, settlementFactionId, 0L, 0, 0, 0, 0, 0, 0, BannerModSettlementStockpileSummary.empty(), BannerModSettlementMarketState.empty(), BannerModSettlementDesiredGoodsSeed.empty(), BannerModSettlementProjectCandidateSeed.empty(), BannerModSettlementTradeRouteHandoffSeed.empty(), BannerModSettlementSupplySignalState.empty(), List.of(), List.of());
+ public static SettlementSnapshot create(UUID claimUuid, ChunkPos anchorChunk, @Nullable String settlementFactionId) {
+ return new SettlementSnapshot(claimUuid, anchorChunk.x, anchorChunk.z, settlementFactionId, 0L, 0, 0, 0, 0, 0, 0, SettlementStockpileSummary.empty(), SettlementMarketState.empty(), SettlementDesiredGoodsSnapshot.empty(), SettlementProjectCandidateSnapshot.empty(), SettlementTradeRouteHandoffSnapshot.empty(), SettlementSupplySignalState.empty(), List.of(), List.of());
}
- private static List<BannerModSettlementResidentRecord> readResidents(ListTag list) {
- List<BannerModSettlementResidentRecord> residents = new ArrayList<>();
+ private static List<SettlementResidentRecord> readResidents(ListTag list) {
+ List<SettlementResidentRecord> residents = new ArrayList<>();
for (Tag entry : list) {
- residents.add(BannerModSettlementResidentRecord.fromTag((CompoundTag) entry));
+ residents.add(SettlementResidentRecord.fromTag((CompoundTag) entry));
}
return residents;
}
- private static List<BannerModSettlementBuildingRecord> readBuildings(ListTag list) {
- List<BannerModSettlementBuildingRecord> buildings = new ArrayList<>();
+ private static List<SettlementBuildingRecord> readBuildings(ListTag list) {
+ List<SettlementBuildingRecord> buildings = new ArrayList<>();
for (Tag entry : list) {
- buildings.add(BannerModSettlementBuildingRecord.fromTag((CompoundTag) entry));
+ buildings.add(SettlementBuildingRecord.fromTag((CompoundTag) entry));
}
return buildings;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilder.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshotBuilder.java
similarity index 62%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilder.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshotBuilder.java
index 50c57514..b0a6bd1f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilder.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshotBuilder.java
@@ -19,48 +19,51 @@
import java.util.Set;
import java.util.UUID;
-final class BannerModSettlementSnapshotBuilder {
+final class SettlementSnapshotBuilder {
- private BannerModSettlementSnapshotBuilder() {
+ private SettlementSnapshotBuilder() {
}
- static BannerModSettlementSnapshot buildSnapshot(ServerLevel level,
+ static SettlementSnapshot buildSnapshot(ServerLevel level,
RecruitsClaim claim,
@Nullable BannerModGovernorManager governorManager) {
- ChunkPos anchorChunk = BannerModSettlementService.resolveAnchorChunk(claim);
+ ChunkPos anchorChunk = SettlementSnapshotRuntime.resolveAnchorChunk(claim);
BannerModGovernorSnapshot governorSnapshot = governorManager == null ? null : governorManager.getSnapshot(claim.getUUID());
- String settlementFactionId = claim.getOwnerPoliticalEntityId() != null
- ? claim.getOwnerPoliticalEntityId().toString()
- : governorSnapshot == null ? null : governorSnapshot.settlementFactionId();
+ String settlementFactionId = null;
+ if (claim.getOwnerPoliticalEntityId() != null) {
+ settlementFactionId = claim.getOwnerPoliticalEntityId().toString();
+ } else if (governorSnapshot != null) {
+ settlementFactionId = governorSnapshot.settlementFactionId();
+ }
- List<AbstractWorkAreaEntity> workAreas = BannerModSettlementService.collectWorkAreas(level, claim, AbstractWorkAreaEntity.class);
- SettlementRecord settlementRecord = BannerModSettlementService.settlementRecordForClaim(level, claim);
- List<ValidatedBuildingRecord> validatedBuildings = BannerModSettlementService.collectValidatedBuildings(level, settlementRecord);
- BannerModSettlementService.repairClaimState(level, claim, workAreas, validatedBuildings);
+ List<AbstractWorkAreaEntity> workAreas = SettlementSnapshotRuntime.collectWorkAreas(level, claim, AbstractWorkAreaEntity.class);
+ SettlementRecord settlementRecord = SettlementSnapshotRuntime.settlementRecordForClaim(level, claim);
+ List<ValidatedBuildingRecord> validatedBuildings = SettlementSnapshotRuntime.collectValidatedBuildings(level, settlementRecord);
+ SettlementSnapshotRuntime.repairClaimState(level, claim, workAreas, validatedBuildings);
- List<BannerModSettlementResidentRecord> residents = BannerModSettlementService.collectResidents(level, claim, governorSnapshot, settlementFactionId);
- List<BannerModSettlementBuildingRecord> buildings = BannerModSettlementService.collectBuildings(level, claim);
- BannerModSettlementMarketState marketState = BannerModSettlementService.collectMarketState(level, claim);
- List<StorageArea> storageAreas = BannerModSettlementService.collectStorageAreas(level, claim);
- List<BannerModSeaTradeEntrypoint> liveSeaTradeEntrypoints = BannerModSettlementService.collectLiveSeaTradeEntrypoints(storageAreas);
- List<BannerModSeaTradeExecutionRecord> localSeaTradeExecutions = BannerModSettlementService.collectLocalSeaTradeExecutions(level, storageAreas);
+ List<SettlementResidentRecord> residents = SettlementSnapshotRuntime.collectResidents(level, claim, governorSnapshot, settlementFactionId);
+ List<SettlementBuildingRecord> buildings = SettlementSnapshotRuntime.collectBuildings(level, claim);
+ SettlementMarketState marketState = SettlementSnapshotRuntime.collectMarketState(level, claim);
+ List<StorageArea> storageAreas = SettlementSnapshotRuntime.collectStorageAreas(level, claim);
+ List<BannerModSeaTradeEntrypoint> liveSeaTradeEntrypoints = SettlementSnapshotRuntime.collectLiveSeaTradeEntrypoints(storageAreas);
+ List<BannerModSeaTradeExecutionRecord> localSeaTradeExecutions = SettlementSnapshotRuntime.collectLocalSeaTradeExecutions(level, storageAreas);
Set<UUID> localBuildingUuids = new LinkedHashSet<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ for (SettlementBuildingRecord building : buildings) {
localBuildingUuids.add(building.buildingUuid());
}
- BannerModSettlementResidentStaffingService.StaffingResult staffing = BannerModSettlementResidentStaffingService.apply(
+ SettlementResidentStaffingService.StaffingResult staffing = SettlementResidentStaffingService.apply(
residents,
buildings,
marketState,
localBuildingUuids
);
- BannerModSettlementLogisticsDerivationService.LogisticsResult logistics = BannerModSettlementLogisticsDerivationService.derive(
+ SettlementLogisticsDerivationService.LogisticsResult logistics = SettlementLogisticsDerivationService.derive(
staffing.buildings(),
staffing.residents(),
staffing.marketState(),
liveSeaTradeEntrypoints,
- BannerModSettlementService.collectLocalLogisticsRoutes(storageAreas),
+ SettlementSnapshotRuntime.collectLocalLogisticsRoutes(storageAreas),
BannerModLogisticsRuntime.service().listReservations(),
localSeaTradeExecutions,
governorSnapshot != null && governorSnapshot.governorRecruitUuid() != null,
@@ -68,7 +71,7 @@ static BannerModSettlementSnapshot buildSnapshot(ServerLevel level,
);
SnapshotCounts counts = summarizeCounts(staffing.buildings(), staffing.residents());
- return new BannerModSettlementSnapshot(
+ return new SettlementSnapshot(
claim.getUUID(),
anchorChunk.x,
anchorChunk.z,
@@ -82,30 +85,30 @@ static BannerModSettlementSnapshot buildSnapshot(ServerLevel level,
counts.missingWorkAreaAssignmentCount(),
logistics.stockpileSummary(),
staffing.marketState(),
- logistics.desiredGoodsSeed(),
- logistics.projectCandidateSeed(),
- logistics.tradeRouteHandoffSeed(),
+ logistics.desiredGoodsSnapshot(),
+ logistics.projectCandidateSnapshot(),
+ logistics.tradeRouteHandoffSnapshot(),
logistics.supplySignalState(),
staffing.residents(),
staffing.buildings()
);
}
- private static SnapshotCounts summarizeCounts(List<BannerModSettlementBuildingRecord> buildings,
- List<BannerModSettlementResidentRecord> residents) {
+ private static SnapshotCounts summarizeCounts(List<SettlementBuildingRecord> buildings,
+ List<SettlementResidentRecord> residents) {
int residentCapacity = 0;
int workplaceCapacity = 0;
int assignedWorkerCount = 0;
int assignedResidentCount = 0;
int unassignedWorkerCount = 0;
int missingWorkAreaAssignmentCount = 0;
- for (BannerModSettlementBuildingRecord building : buildings) {
+ for (SettlementBuildingRecord building : buildings) {
residentCapacity += Math.max(0, building.residentCapacity());
workplaceCapacity += Math.max(0, building.workplaceSlots());
assignedWorkerCount += Math.max(0, building.assignedWorkerCount());
}
- for (BannerModSettlementResidentRecord resident : residents) {
- if (resident.role() != BannerModSettlementResidentRole.CONTROLLED_WORKER) {
+ for (SettlementResidentRecord resident : residents) {
+ if (resident.role() != SettlementResidentRole.CONTROLLED_WORKER) {
continue;
}
switch (resident.assignmentState()) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementService.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshotRuntime.java
similarity index 62%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementService.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshotRuntime.java
index 969f57d8..e82bb3d7 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementService.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSnapshotRuntime.java
@@ -10,10 +10,9 @@
import com.talhanation.bannermod.entity.civilian.workarea.StorageArea;
import com.talhanation.bannermod.entity.civilian.workarea.WorkAreaIndex;
import com.talhanation.bannermod.settlement.runtime.SettlementClaimBindingService;
-import com.talhanation.bannermod.governance.BannerModGovernorManager;
+import com.talhanation.bannermod.settlement.runtime.SettlementSeaTradeAnalyzer;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.persistence.military.RecruitsClaimManager;
import com.talhanation.bannermod.settlement.bootstrap.SettlementRecord;
import com.talhanation.bannermod.settlement.bootstrap.SettlementRegistryData;
import com.talhanation.bannermod.settlement.building.BuildingType;
@@ -40,7 +39,6 @@
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -51,46 +49,8 @@
import java.util.Set;
import java.util.UUID;
-public final class BannerModSettlementService {
- private BannerModSettlementService() {
- }
-
- public static void refreshAllClaims(ServerLevel level,
- RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
- BannerModGovernorManager governorManager) {
- SettlementClaimBindingService.refreshAllClaims(level, claimManager, settlementManager, governorManager);
- }
-
- public static SettlementClaimBindingService.BatchResult refreshClaimsBatch(ServerLevel level,
- RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
- BannerModGovernorManager governorManager,
- int startIndex,
- int maxClaims) {
- return SettlementClaimBindingService.refreshClaimsBatch(level, claimManager, settlementManager, governorManager, startIndex, maxClaims);
- }
-
- public static void refreshClaimAt(ServerLevel level,
- RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
- BannerModGovernorManager governorManager,
- BlockPos pos) {
- SettlementClaimBindingService.refreshClaimAt(level, claimManager, settlementManager, governorManager, pos);
- }
-
- public static void refreshClaim(ServerLevel level,
- RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
- @Nullable BannerModGovernorManager governorManager,
- @Nullable RecruitsClaim claim) {
- SettlementClaimBindingService.refreshClaim(level, claimManager, settlementManager, governorManager, claim);
- }
-
- public static BannerModSettlementSnapshot buildSnapshot(ServerLevel level,
- RecruitsClaim claim,
- @Nullable BannerModGovernorManager governorManager) {
- return BannerModSettlementSnapshotBuilder.buildSnapshot(level, claim, governorManager);
+final class SettlementSnapshotRuntime {
+ private SettlementSnapshotRuntime() {
}
static void repairClaimState(ServerLevel level,
@@ -100,55 +60,55 @@ static void repairClaimState(ServerLevel level,
SettlementClaimBindingService.repairClaimState(level, claim, workAreas, validatedBuildings);
}
- static List<BannerModSettlementResidentRecord> collectResidents(ServerLevel level,
+ static List<SettlementResidentRecord> collectResidents(ServerLevel level,
RecruitsClaim claim,
@Nullable BannerModGovernorSnapshot governorSnapshot,
@Nullable String settlementFactionId) {
- Map<UUID, BannerModSettlementResidentRecord> residents = new LinkedHashMap<>();
+ Map<UUID, SettlementResidentRecord> residents = new LinkedHashMap<>();
for (Villager villager : level.getEntitiesOfClass(Villager.class, claimBounds(level, claim), entity -> entity.isAlive() && claim.containsChunk(entity.chunkPosition()))) {
- residents.put(villager.getUUID(), new BannerModSettlementResidentRecord(
+ residents.put(villager.getUUID(), new SettlementResidentRecord(
villager.getUUID(),
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentJobDefinition.defaultFor(
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentJobDefinition.defaultFor(
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE,
+ SettlementResidentServiceContract.notServiceActor(),
null
),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
null,
villager.getTeam() == null ? settlementFactionId : villager.getTeam().getName(),
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE
));
}
for (AbstractWorkerEntity worker : workersInClaim(level, claim)) {
- BannerModSettlementResidentScheduleSeed scheduleSeed = BannerModSettlementResidentScheduleSeed.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, worker.getBoundWorkAreaUUID());
- BannerModSettlementResidentMode residentMode = BannerModSettlementResidentMode.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, worker.getOwnerUUID());
- BannerModSettlementResidentAssignmentState assignmentState = worker.getBoundWorkAreaUUID() == null
- ? BannerModSettlementResidentAssignmentState.UNASSIGNED
- : BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING;
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed = BannerModSettlementResidentRuntimeRoleSeed.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed scheduleSeed = SettlementResidentScheduleSeed.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, worker.getBoundWorkAreaUUID());
+ SettlementResidentMode residentMode = SettlementResidentMode.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, worker.getOwnerUUID());
+ SettlementResidentAssignmentState assignmentState = worker.getBoundWorkAreaUUID() == null
+ ? SettlementResidentAssignmentState.UNASSIGNED
+ : SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING;
+ SettlementResidentRuntimeRoleState runtimeRoleState = SettlementResidentRuntimeRoleState.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
scheduleSeed,
residentMode,
assignmentState
);
- residents.put(worker.getUUID(), new BannerModSettlementResidentRecord(
+ residents.put(worker.getUUID(), new SettlementResidentRecord(
worker.getUUID(),
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentRole.CONTROLLED_WORKER,
scheduleSeed,
- BannerModSettlementResidentScheduleWindowSeed.defaultFor(scheduleSeed, runtimeRoleSeed),
- runtimeRoleSeed,
- BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, residentMode, assignmentState, worker.getBoundWorkAreaUUID(), null),
- BannerModSettlementResidentJobDefinition.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- runtimeRoleSeed,
- BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, residentMode, assignmentState, worker.getBoundWorkAreaUUID(), null),
+ SettlementResidentScheduleWindowSeed.defaultFor(scheduleSeed, runtimeRoleState),
+ runtimeRoleState,
+ SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, residentMode, assignmentState, worker.getBoundWorkAreaUUID(), null),
+ SettlementResidentJobDefinition.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
+ runtimeRoleState,
+ SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, residentMode, assignmentState, worker.getBoundWorkAreaUUID(), null),
null
),
residentMode,
@@ -159,24 +119,24 @@ static List<BannerModSettlementResidentRecord> collectResidents(ServerLevel leve
));
}
if (governorSnapshot != null && governorSnapshot.governorRecruitUuid() != null) {
- residents.put(governorSnapshot.governorRecruitUuid(), new BannerModSettlementResidentRecord(
+ residents.put(governorSnapshot.governorRecruitUuid(), new SettlementResidentRecord(
governorSnapshot.governorRecruitUuid(),
- BannerModSettlementResidentRole.GOVERNOR_RECRUIT,
- BannerModSettlementResidentScheduleSeed.GOVERNING,
- BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentJobDefinition.defaultFor(
- BannerModSettlementResidentRole.GOVERNOR_RECRUIT,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentRole.GOVERNOR_RECRUIT,
+ SettlementResidentScheduleSeed.GOVERNING,
+ SettlementResidentScheduleWindowSeed.CIVIC_DAY,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentJobDefinition.defaultFor(
+ SettlementResidentRole.GOVERNOR_RECRUIT,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentServiceContract.notServiceActor(),
null
),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
governorSnapshot.governorOwnerUuid(),
settlementFactionId,
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE
));
}
return new ArrayList<>(residents.values());
@@ -191,56 +151,56 @@ public static List<AbstractWorkerEntity> workersInClaim(ServerLevel level, Recru
});
}
- static List<BannerModSettlementResidentRecord> applyResidentAssignmentSemantics(List<BannerModSettlementResidentRecord> residents,
+ static List<SettlementResidentRecord> applyResidentAssignmentSemantics(List<SettlementResidentRecord> residents,
Set<UUID> localBuildingUuids) {
if (residents.isEmpty()) {
return List.of();
}
- List<BannerModSettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
- for (BannerModSettlementResidentRecord resident : residents) {
- if (resident.role() != BannerModSettlementResidentRole.CONTROLLED_WORKER) {
+ List<SettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
+ for (SettlementResidentRecord resident : residents) {
+ if (resident.role() != SettlementResidentRole.CONTROLLED_WORKER) {
updatedResidents.add(resident);
continue;
}
- BannerModSettlementResidentAssignmentState assignmentState;
+ SettlementResidentAssignmentState assignmentState;
if (resident.boundWorkAreaUuid() == null) {
- assignmentState = BannerModSettlementResidentAssignmentState.UNASSIGNED;
+ assignmentState = SettlementResidentAssignmentState.UNASSIGNED;
} else if (localBuildingUuids.contains(resident.boundWorkAreaUuid())) {
- assignmentState = BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
+ assignmentState = SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
} else {
- assignmentState = BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING;
+ assignmentState = SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING;
}
- BannerModSettlementResidentRuntimeRoleSeed runtimeRoleSeed = BannerModSettlementResidentRuntimeRoleSeed.defaultFor(
+ SettlementResidentRuntimeRoleState runtimeRoleState = SettlementResidentRuntimeRoleState.defaultFor(
resident.role(),
resident.scheduleSeed(),
resident.residentMode(),
assignmentState
);
- BannerModSettlementResidentScheduleWindowSeed scheduleWindowSeed = BannerModSettlementResidentScheduleWindowSeed.defaultFor(
+ SettlementResidentScheduleWindowSeed scheduleWindowSeed = SettlementResidentScheduleWindowSeed.defaultFor(
resident.scheduleSeed(),
- runtimeRoleSeed
+ runtimeRoleState
);
- updatedResidents.add(new BannerModSettlementResidentRecord(
+ updatedResidents.add(new SettlementResidentRecord(
resident.residentUuid(),
resident.role(),
resident.scheduleSeed(),
scheduleWindowSeed,
- runtimeRoleSeed,
+ runtimeRoleState,
resident.serviceContract(),
resident.jobDefinition(),
- resident.jobTargetSelectionSeed(),
+ resident.jobTargetSelectionState(),
resident.residentMode(),
resident.ownerUuid(),
resident.teamId(),
resident.boundWorkAreaUuid(),
assignmentState,
- BannerModSettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRoleProfile.defaultFor(
resident.role(),
- runtimeRoleSeed,
+ runtimeRoleState,
resident.residentMode(),
assignmentState
)
@@ -249,38 +209,38 @@ static List<BannerModSettlementResidentRecord> applyResidentAssignmentSemantics(
return updatedResidents;
}
- static List<BannerModSettlementResidentRecord> applyResidentServiceContracts(List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings) {
+ static List<SettlementResidentRecord> applyResidentServiceContracts(List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings) {
if (residents.isEmpty()) {
return List.of();
}
- Map<UUID, BannerModSettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ Map<UUID, SettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
+ for (SettlementBuildingRecord building : buildings) {
buildingsByUuid.put(building.buildingUuid(), building);
}
- List<BannerModSettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
- for (BannerModSettlementResidentRecord resident : residents) {
- BannerModSettlementBuildingRecord serviceBuilding = resident.boundWorkAreaUuid() == null
+ List<SettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
+ for (SettlementResidentRecord resident : residents) {
+ SettlementBuildingRecord serviceBuilding = resident.boundWorkAreaUuid() == null
? null
: buildingsByUuid.get(resident.boundWorkAreaUuid());
- BannerModSettlementResidentServiceContract serviceContract = BannerModSettlementResidentServiceContract.defaultFor(
+ SettlementResidentServiceContract serviceContract = SettlementResidentServiceContract.defaultFor(
resident.role(),
resident.residentMode(),
resident.assignmentState(),
resident.boundWorkAreaUuid(),
serviceBuilding == null ? null : serviceBuilding.buildingTypeId()
);
- updatedResidents.add(new BannerModSettlementResidentRecord(
+ updatedResidents.add(new SettlementResidentRecord(
resident.residentUuid(),
resident.role(),
resident.scheduleSeed(),
resident.scheduleWindowSeed(),
- resident.runtimeRoleSeed(),
+ resident.runtimeRoleState(),
serviceContract,
resident.jobDefinition(),
- resident.jobTargetSelectionSeed(),
+ resident.jobTargetSelectionState(),
resident.residentMode(),
resident.ownerUuid(),
resident.teamId(),
@@ -292,37 +252,37 @@ static List<BannerModSettlementResidentRecord> applyResidentServiceContracts(Lis
return updatedResidents;
}
- static List<BannerModSettlementResidentRecord> applyResidentJobDefinitions(List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings) {
+ static List<SettlementResidentRecord> applyResidentJobDefinitions(List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings) {
if (residents.isEmpty()) {
return List.of();
}
- Map<UUID, BannerModSettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ Map<UUID, SettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
+ for (SettlementBuildingRecord building : buildings) {
buildingsByUuid.put(building.buildingUuid(), building);
}
- List<BannerModSettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
- for (BannerModSettlementResidentRecord resident : residents) {
- BannerModSettlementBuildingRecord targetBuilding = resident.serviceContract().serviceBuildingUuid() == null
+ List<SettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
+ for (SettlementResidentRecord resident : residents) {
+ SettlementBuildingRecord targetBuilding = resident.serviceContract().serviceBuildingUuid() == null
? null
: buildingsByUuid.get(resident.serviceContract().serviceBuildingUuid());
- BannerModSettlementResidentJobDefinition jobDefinition = BannerModSettlementResidentJobDefinition.defaultFor(
+ SettlementResidentJobDefinition jobDefinition = SettlementResidentJobDefinition.defaultFor(
resident.role(),
- resident.runtimeRoleSeed(),
+ resident.runtimeRoleState(),
resident.serviceContract(),
targetBuilding
);
- updatedResidents.add(new BannerModSettlementResidentRecord(
+ updatedResidents.add(new SettlementResidentRecord(
resident.residentUuid(),
resident.role(),
resident.scheduleSeed(),
resident.scheduleWindowSeed(),
- resident.runtimeRoleSeed(),
+ resident.runtimeRoleState(),
resident.serviceContract(),
jobDefinition,
- resident.jobTargetSelectionSeed(),
+ resident.jobTargetSelectionState(),
resident.residentMode(),
resident.ownerUuid(),
resident.teamId(),
@@ -334,29 +294,29 @@ static List<BannerModSettlementResidentRecord> applyResidentJobDefinitions(List<
return updatedResidents;
}
- static List<BannerModSettlementResidentRecord> applyResidentJobTargetSelectionSeeds(List<BannerModSettlementResidentRecord> residents,
- BannerModSettlementMarketState marketState) {
+ static List<SettlementResidentRecord> applyResidentJobTargetSelectionStates(List<SettlementResidentRecord> residents,
+ SettlementMarketState marketState) {
if (residents.isEmpty()) {
return List.of();
}
- List<BannerModSettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
- for (BannerModSettlementResidentRecord resident : residents) {
- BannerModSettlementResidentJobTargetSelectionSeed jobTargetSelectionSeed = BannerModSettlementResidentJobTargetSelectionSeed.defaultFor(
+ List<SettlementResidentRecord> updatedResidents = new ArrayList<>(residents.size());
+ for (SettlementResidentRecord resident : residents) {
+ SettlementResidentJobTargetSelectionState jobTargetSelectionState = SettlementResidentJobTargetSelectionState.defaultFor(
resident.residentUuid(),
resident.jobDefinition(),
resident.serviceContract(),
marketState
);
- updatedResidents.add(new BannerModSettlementResidentRecord(
+ updatedResidents.add(new SettlementResidentRecord(
resident.residentUuid(),
resident.role(),
resident.scheduleSeed(),
resident.scheduleWindowSeed(),
- resident.runtimeRoleSeed(),
+ resident.runtimeRoleState(),
resident.serviceContract(),
resident.jobDefinition(),
- jobTargetSelectionSeed,
+ jobTargetSelectionState,
resident.residentMode(),
resident.ownerUuid(),
resident.teamId(),
@@ -369,9 +329,9 @@ static List<BannerModSettlementResidentRecord> applyResidentJobTargetSelectionSe
return updatedResidents;
}
- static List<BannerModSettlementBuildingRecord> collectBuildings(ServerLevel level,
+ static List<SettlementBuildingRecord> collectBuildings(ServerLevel level,
RecruitsClaim claim) {
- List<BannerModSettlementBuildingRecord> buildings = new ArrayList<>();
+ List<SettlementBuildingRecord> buildings = new ArrayList<>();
List<AbstractWorkAreaEntity> workAreas = collectWorkAreas(level, claim, AbstractWorkAreaEntity.class);
SettlementRecord settlementRecord = settlementRecordForClaim(level, claim);
List<ValidatedBuildingRecord> validatedBuildings = collectValidatedBuildings(level, settlementRecord);
@@ -412,16 +372,16 @@ static List<BannerModSettlementBuildingRecord> collectBuildings(ServerLevel leve
return buildings;
}
- static BannerModSettlementBuildingRecord mergeValidatedBuildingIntoLiveRecord(ValidatedBuildingRecord record,
- BannerModSettlementBuildingRecord liveRecord) {
- BannerModSettlementBuildingRecord validatedRecord = fromValidatedBuildingFields(
+ static SettlementBuildingRecord mergeValidatedBuildingIntoLiveRecord(ValidatedBuildingRecord record,
+ SettlementBuildingRecord liveRecord) {
+ SettlementBuildingRecord validatedRecord = fromValidatedBuildingFields(
liveRecord.buildingUuid(),
record.type(),
liveRecord.originPos(),
record.capacity(),
liveRecord.ownerUuid()
);
- return new BannerModSettlementBuildingRecord(
+ return new SettlementBuildingRecord(
liveRecord.buildingUuid(),
liveRecord.buildingTypeId(),
liveRecord.originPos(),
@@ -442,7 +402,7 @@ static BannerModSettlementBuildingRecord mergeValidatedBuildingIntoLiveRecord(Va
);
}
- static BannerModSettlementBuildingRecord fromValidatedBuilding(ValidatedBuildingRecord record,
+ static SettlementBuildingRecord fromValidatedBuilding(ValidatedBuildingRecord record,
RecruitsClaim claim) {
return fromValidatedBuildingFields(
record.buildingId(),
@@ -453,7 +413,7 @@ static BannerModSettlementBuildingRecord fromValidatedBuilding(ValidatedBuilding
);
}
- static BannerModSettlementBuildingRecord fromValidatedBuildingFields(UUID buildingId,
+ static SettlementBuildingRecord fromValidatedBuildingFields(UUID buildingId,
BuildingType type,
BlockPos anchorPos,
int rawCapacity,
@@ -470,8 +430,8 @@ static BannerModSettlementBuildingRecord fromValidatedBuildingFields(UUID buildi
boolean stockpileBuilding = type == BuildingType.STORAGE;
int stockpileContainers = stockpileBuilding ? Math.max(1, capacity) : 0;
int stockpileSlots = stockpileBuilding ? Math.max(27, capacity * 27) : 0;
- BannerModSettlementBuildingProfileSeed profileSeed = profileSeedForValidatedBuilding(type);
- return new BannerModSettlementBuildingRecord(
+ SettlementBuildingProfileSeed profileSeed = profileSeedForValidatedBuilding(type);
+ return new SettlementBuildingRecord(
buildingId,
"bannermod:validated_" + type.name().toLowerCase(Locale.ROOT),
anchorPos,
@@ -535,10 +495,10 @@ static SettlementRecord settlementRecordForClaim(ServerLevel level, RecruitsClai
return SettlementRegistryData.get(level).getSettlementByClaimId(claim.getUUID());
}
- private static BannerModSettlementBuildingRecord fromLiveWorkArea(AbstractWorkAreaEntity workArea) {
+ private static SettlementBuildingRecord fromLiveWorkArea(AbstractWorkAreaEntity workArea) {
StockpileSeed stockpileSeed = resolveStockpileSeed(workArea);
- BannerModSettlementBuildingProfileSeed profileSeed = BannerModSettlementBuildingProfileSeed.fromWorkArea(workArea);
- return new BannerModSettlementBuildingRecord(
+ SettlementBuildingProfileSeed profileSeed = SettlementBuildingProfileSeed.fromWorkArea(workArea);
+ return new SettlementBuildingRecord(
workArea.getUUID(),
resolveBuildingTypeId(workArea),
workArea.getOriginPos(),
@@ -627,29 +587,29 @@ private static boolean isCompatibleValidatedWorkArea(BuildingType type, Abstract
};
}
- private static BannerModSettlementBuildingProfileSeed profileSeedForValidatedBuilding(BuildingType type) {
+ private static SettlementBuildingProfileSeed profileSeedForValidatedBuilding(BuildingType type) {
if (type == null) {
- return BannerModSettlementBuildingProfileSeed.GENERAL;
+ return SettlementBuildingProfileSeed.GENERAL;
}
return switch (type) {
- case FARM -> BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION;
- case MINE, LUMBER_CAMP, SMITHY -> BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION;
- case STORAGE -> BannerModSettlementBuildingProfileSeed.STORAGE;
- case ARCHITECT_WORKSHOP -> BannerModSettlementBuildingProfileSeed.CONSTRUCTION;
- default -> BannerModSettlementBuildingProfileSeed.GENERAL;
+ case FARM -> SettlementBuildingProfileSeed.FOOD_PRODUCTION;
+ case MINE, LUMBER_CAMP, SMITHY -> SettlementBuildingProfileSeed.MATERIAL_PRODUCTION;
+ case STORAGE -> SettlementBuildingProfileSeed.STORAGE;
+ case ARCHITECT_WORKSHOP -> SettlementBuildingProfileSeed.CONSTRUCTION;
+ default -> SettlementBuildingProfileSeed.GENERAL;
};
}
- static List<BannerModSettlementBuildingRecord> applyAssignedResidents(List<BannerModSettlementBuildingRecord> buildings,
- List<BannerModSettlementResidentRecord> residents) {
+ static List<SettlementBuildingRecord> applyAssignedResidents(List<SettlementBuildingRecord> buildings,
+ List<SettlementResidentRecord> residents) {
if (buildings.isEmpty()) {
return List.of();
}
Map<UUID, List<UUID>> assignedResidentsByBuilding = new LinkedHashMap<>();
- for (BannerModSettlementResidentRecord resident : residents) {
- if (resident.role() != BannerModSettlementResidentRole.CONTROLLED_WORKER
- || resident.assignmentState() != BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ for (SettlementResidentRecord resident : residents) {
+ if (resident.role() != SettlementResidentRole.CONTROLLED_WORKER
+ || resident.assignmentState() != SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
|| resident.boundWorkAreaUuid() == null) {
continue;
}
@@ -657,10 +617,10 @@ static List<BannerModSettlementBuildingRecord> applyAssignedResidents(List<Banne
.add(resident.residentUuid());
}
- List<BannerModSettlementBuildingRecord> updatedBuildings = new ArrayList<>(buildings.size());
- for (BannerModSettlementBuildingRecord building : buildings) {
+ List<SettlementBuildingRecord> updatedBuildings = new ArrayList<>(buildings.size());
+ for (SettlementBuildingRecord building : buildings) {
List<UUID> assignedResidents = assignedResidentsByBuilding.getOrDefault(building.buildingUuid(), List.of());
- updatedBuildings.add(new BannerModSettlementBuildingRecord(
+ updatedBuildings.add(new SettlementBuildingRecord(
building.buildingUuid(),
building.buildingTypeId(),
building.originPos(),
@@ -683,14 +643,14 @@ static List<BannerModSettlementBuildingRecord> applyAssignedResidents(List<Banne
return updatedBuildings;
}
- static BannerModSettlementStockpileSummary summarizeStockpiles(List<BannerModSettlementBuildingRecord> buildings) {
+ static SettlementStockpileSummary summarizeStockpiles(List<SettlementBuildingRecord> buildings) {
return summarizeStockpiles(buildings, List.of());
}
- static BannerModSettlementStockpileSummary summarizeStockpiles(List<BannerModSettlementBuildingRecord> buildings,
+ static SettlementStockpileSummary summarizeStockpiles(List<SettlementBuildingRecord> buildings,
List<BannerModSeaTradeEntrypoint> liveSeaTradeEntrypoints) {
if (buildings.isEmpty()) {
- return BannerModSettlementStockpileSummary.empty();
+ return SettlementStockpileSummary.empty();
}
int storageBuildingCount = 0;
@@ -699,7 +659,7 @@ static BannerModSettlementStockpileSummary summarizeStockpiles(List<BannerModSet
int routedStorageCount = 0;
int portEntrypointCount = 0;
Set<String> authoredStorageTypeIds = new LinkedHashSet<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ for (SettlementBuildingRecord building : buildings) {
if (!building.stockpileBuilding()) {
continue;
}
@@ -722,7 +682,7 @@ static BannerModSettlementStockpileSummary summarizeStockpiles(List<BannerModSet
portStorageIds.add(entrypoint.portStorageAreaId());
}
- return new BannerModSettlementStockpileSummary(
+ return new SettlementStockpileSummary(
storageBuildingCount,
containerCount,
slotCapacity,
@@ -732,15 +692,15 @@ static BannerModSettlementStockpileSummary summarizeStockpiles(List<BannerModSet
);
}
- static BannerModSettlementMarketState summarizeMarketState(List<BannerModSettlementMarketRecord> markets) {
+ static SettlementMarketState summarizeMarketState(List<SettlementMarketRecord> markets) {
if (markets.isEmpty()) {
- return BannerModSettlementMarketState.empty();
+ return SettlementMarketState.empty();
}
int openMarketCount = 0;
int totalStorageSlots = 0;
int freeStorageSlots = 0;
- for (BannerModSettlementMarketRecord market : markets) {
+ for (SettlementMarketRecord market : markets) {
if (market.open()) {
openMarketCount++;
}
@@ -748,21 +708,21 @@ static BannerModSettlementMarketState summarizeMarketState(List<BannerModSettlem
freeStorageSlots += Math.max(0, market.freeStorageSlots());
}
- return new BannerModSettlementMarketState(markets.size(), openMarketCount, totalStorageSlots, freeStorageSlots, 0, 0, markets, List.of());
+ return new SettlementMarketState(markets.size(), openMarketCount, totalStorageSlots, freeStorageSlots, 0, 0, markets, List.of());
}
- static BannerModSettlementDesiredGoodsSeed summarizeDesiredGoods(List<BannerModSettlementBuildingRecord> buildings,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState) {
+ static SettlementDesiredGoodsSnapshot summarizeDesiredGoods(List<SettlementBuildingRecord> buildings,
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState) {
return summarizeDesiredGoods(buildings, stockpileSummary, marketState, BannerModSeaTradeSummary.summarise(List.of()));
}
- static BannerModSettlementDesiredGoodsSeed summarizeDesiredGoods(List<BannerModSettlementBuildingRecord> buildings,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
+ static SettlementDesiredGoodsSnapshot summarizeDesiredGoods(List<SettlementBuildingRecord> buildings,
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
BannerModSeaTradeSummary.Summary seaTradeSummary) {
Map<String, Integer> desiredGoods = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ for (SettlementBuildingRecord building : buildings) {
String desiredGoodId = switch (building.buildingProfileSeed()) {
case FOOD_PRODUCTION -> "food";
case MATERIAL_PRODUCTION -> "materials";
@@ -777,88 +737,85 @@ static BannerModSettlementDesiredGoodsSeed summarizeDesiredGoods(List<BannerModS
}
addDesiredGoodDriver(desiredGoods, "market_goods", marketState.marketCount());
addDesiredGoodDriver(desiredGoods, "trade_stock", marketState.openMarketCount());
- for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.importableByItem().entrySet()) {
- addDesiredGoodDriver(desiredGoods, "sea_import:" + entry.getKey(), entry.getValue());
- }
- for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.exportableByItem().entrySet()) {
- addDesiredGoodDriver(desiredGoods, "sea_export:" + entry.getKey(), entry.getValue());
+ for (SettlementDesiredGoodSnapshot seaTradeDesiredGood : SettlementSeaTradeAnalyzer.desiredGoods(seaTradeSummary)) {
+ addDesiredGoodDriver(desiredGoods, seaTradeDesiredGood.desiredGoodId(), seaTradeDesiredGood.driverCount());
}
- List<BannerModSettlementDesiredGoodSeed> desiredGoodSeeds = new ArrayList<>(desiredGoods.size());
+ List<SettlementDesiredGoodSnapshot> desiredGoodSeeds = new ArrayList<>(desiredGoods.size());
for (Map.Entry<String, Integer> entry : desiredGoods.entrySet()) {
- desiredGoodSeeds.add(new BannerModSettlementDesiredGoodSeed(entry.getKey(), entry.getValue()));
+ desiredGoodSeeds.add(new SettlementDesiredGoodSnapshot(entry.getKey(), entry.getValue()));
}
- return new BannerModSettlementDesiredGoodsSeed(desiredGoodSeeds);
+ return new SettlementDesiredGoodsSnapshot(desiredGoodSeeds);
}
- static BannerModSettlementTradeRouteHandoffSeed summarizeTradeRouteHandoffSeed(BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
+ static SettlementTradeRouteHandoffSnapshot summarizeTradeRouteHandoffSnapshot(SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
ReservationSignalSeed reservationSignalSeed) {
- return summarizeTradeRouteHandoffSeed(stockpileSummary, marketState, desiredGoodsSeed, reservationSignalSeed, BannerModSeaTradeSummary.summarise(List.of()));
+ return summarizeTradeRouteHandoffSnapshot(stockpileSummary, marketState, desiredGoodsSnapshot, reservationSignalSeed, BannerModSeaTradeSummary.summarise(List.of()));
}
- static BannerModSettlementTradeRouteHandoffSeed summarizeTradeRouteHandoffSeed(BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
+ static SettlementTradeRouteHandoffSnapshot summarizeTradeRouteHandoffSnapshot(SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
ReservationSignalSeed reservationSignalSeed,
BannerModSeaTradeSummary.Summary seaTradeSummary) {
- return summarizeTradeRouteHandoffSeed(stockpileSummary, marketState, desiredGoodsSeed, reservationSignalSeed, seaTradeSummary, List.of());
+ return summarizeTradeRouteHandoffSnapshot(stockpileSummary, marketState, desiredGoodsSnapshot, reservationSignalSeed, seaTradeSummary, List.of());
}
- static BannerModSettlementTradeRouteHandoffSeed summarizeTradeRouteHandoffSeed(BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
+ static SettlementTradeRouteHandoffSnapshot summarizeTradeRouteHandoffSnapshot(SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
ReservationSignalSeed reservationSignalSeed,
BannerModSeaTradeSummary.Summary seaTradeSummary,
List<BannerModSeaTradeExecutionRecord> seaTradeExecutionRecords) {
- return new BannerModSettlementTradeRouteHandoffSeed(
+ return new SettlementTradeRouteHandoffSnapshot(
marketState.sellerDispatchCount(),
marketState.readySellerDispatchCount(),
stockpileSummary.routedStorageCount(),
stockpileSummary.portEntrypointCount(),
reservationSignalSeed.activeReservationCount(),
reservationSignalSeed.reservedUnitCount(),
- desiredGoodsSeed.desiredGoods(),
+ desiredGoodsSnapshot.desiredGoods(),
marketState.sellerDispatches(),
- seaTradeStatusLines(seaTradeSummary, seaTradeExecutionRecords)
+ SettlementSeaTradeAnalyzer.statusLines(seaTradeSummary, seaTradeExecutionRecords)
);
}
- static BannerModSettlementSupplySignalState summarizeSupplySignals(BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings,
+ static SettlementSupplySignalState summarizeSupplySignals(SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings,
ReservationSignalSeed reservationSignalSeed) {
- return summarizeSupplySignals(desiredGoodsSeed, stockpileSummary, marketState, residents, buildings, reservationSignalSeed, BannerModSeaTradeSummary.summarise(List.of()));
+ return summarizeSupplySignals(desiredGoodsSnapshot, stockpileSummary, marketState, residents, buildings, reservationSignalSeed, BannerModSeaTradeSummary.summarise(List.of()));
}
- static BannerModSettlementSupplySignalState summarizeSupplySignals(BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings,
+ static SettlementSupplySignalState summarizeSupplySignals(SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings,
ReservationSignalSeed reservationSignalSeed,
BannerModSeaTradeSummary.Summary seaTradeSummary) {
- if (desiredGoodsSeed.desiredGoods().isEmpty()) {
- return BannerModSettlementSupplySignalState.empty();
+ if (desiredGoodsSnapshot.desiredGoods().isEmpty()) {
+ return SettlementSupplySignalState.empty();
}
- Map<UUID, BannerModSettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ Map<UUID, SettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
+ for (SettlementBuildingRecord building : buildings) {
buildingsByUuid.put(building.buildingUuid(), building);
}
Map<String, Integer> serviceCoverageByGood = new LinkedHashMap<>();
- for (BannerModSettlementResidentRecord resident : residents) {
- BannerModSettlementResidentServiceContract serviceContract = resident.serviceContract();
- if (serviceContract.actorState() != BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE
+ for (SettlementResidentRecord resident : residents) {
+ SettlementResidentServiceContract serviceContract = resident.serviceContract();
+ if (serviceContract.actorState() != SettlementServiceActorState.LOCAL_BUILDING_SERVICE
|| serviceContract.serviceBuildingUuid() == null) {
continue;
}
- BannerModSettlementBuildingRecord serviceBuilding = buildingsByUuid.get(serviceContract.serviceBuildingUuid());
+ SettlementBuildingRecord serviceBuilding = buildingsByUuid.get(serviceContract.serviceBuildingUuid());
if (serviceBuilding == null) {
continue;
}
@@ -869,11 +826,11 @@ static BannerModSettlementSupplySignalState summarizeSupplySignals(BannerModSett
}
}
- List<BannerModSettlementSupplySignal> signals = new ArrayList<>();
+ List<SettlementSupplySignal> signals = new ArrayList<>();
int shortageSignalCount = 0;
int shortageUnitCount = 0;
int reservationHintUnitCount = 0;
- for (BannerModSettlementDesiredGoodSeed desiredGood : desiredGoodsSeed.desiredGoods()) {
+ for (SettlementDesiredGoodSnapshot desiredGood : desiredGoodsSnapshot.desiredGoods()) {
int coverageUnits = resolveSupplyCoverageUnits(desiredGood.desiredGoodId(), stockpileSummary, marketState, serviceCoverageByGood, seaTradeSummary);
int shortageUnits = Math.max(0, desiredGood.driverCount() - coverageUnits);
int reservationHintUnits = reservationSignalSeed.reservationHintUnitsByGood().getOrDefault(desiredGood.desiredGoodId(), 0);
@@ -882,7 +839,7 @@ static BannerModSettlementSupplySignalState summarizeSupplySignals(BannerModSett
shortageUnitCount += shortageUnits;
}
reservationHintUnitCount += reservationHintUnits;
- signals.add(new BannerModSettlementSupplySignal(
+ signals.add(new SettlementSupplySignal(
desiredGood.desiredGoodId(),
desiredGood.driverCount(),
coverageUnits,
@@ -891,7 +848,7 @@ static BannerModSettlementSupplySignalState summarizeSupplySignals(BannerModSett
));
}
- return new BannerModSettlementSupplySignalState(
+ return new SettlementSupplySignalState(
signals.size(),
shortageSignalCount,
shortageUnitCount,
@@ -900,27 +857,27 @@ static BannerModSettlementSupplySignalState summarizeSupplySignals(BannerModSett
);
}
- static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<BannerModSettlementBuildingRecord> buildings,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
- BannerModSettlementMarketState marketState,
+ static SettlementProjectCandidateSnapshot summarizeProjectCandidate(List<SettlementBuildingRecord> buildings,
+ SettlementStockpileSummary stockpileSummary,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
+ SettlementMarketState marketState,
boolean governedSettlement,
boolean claimedSettlement) {
- Map<BannerModSettlementBuildingProfileSeed, Integer> profileCounts = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ Map<SettlementBuildingProfileSeed, Integer> profileCounts = new LinkedHashMap<>();
+ for (SettlementBuildingRecord building : buildings) {
profileCounts.merge(building.buildingProfileSeed(), 1, Integer::sum);
}
Map<String, Integer> desiredGoodsById = new LinkedHashMap<>();
- for (BannerModSettlementDesiredGoodSeed desiredGood : desiredGoodsSeed.desiredGoods()) {
+ for (SettlementDesiredGoodSnapshot desiredGood : desiredGoodsSnapshot.desiredGoods()) {
desiredGoodsById.merge(desiredGood.desiredGoodId(), desiredGood.driverCount(), Integer::sum);
}
int governanceBoost = (governedSettlement ? 1 : 0) + (claimedSettlement ? 1 : 0);
if (stockpileSummary.storageBuildingCount() <= 0 && (!buildings.isEmpty() || !desiredGoodsById.isEmpty())) {
- return new BannerModSettlementProjectCandidateSeed(
+ return new SettlementProjectCandidateSnapshot(
"storage_foundation",
- BannerModSettlementBuildingProfileSeed.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE,
1 + governanceBoost + Math.min(2, desiredGoodsById.size()),
governedSettlement,
claimedSettlement,
@@ -928,9 +885,9 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
);
}
if (marketState.marketCount() <= 0 && desiredGoodsById.getOrDefault("market_goods", 0) > 0) {
- return new BannerModSettlementProjectCandidateSeed(
+ return new SettlementProjectCandidateSnapshot(
"market_foundation",
- BannerModSettlementBuildingProfileSeed.MARKET,
+ SettlementBuildingProfileSeed.MARKET,
1 + governanceBoost + Math.min(2, desiredGoodsById.getOrDefault("market_goods", 0)),
governedSettlement,
claimedSettlement,
@@ -938,9 +895,9 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
);
}
if (marketState.marketCount() > marketState.openMarketCount()) {
- return new BannerModSettlementProjectCandidateSeed(
+ return new SettlementProjectCandidateSnapshot(
"market_recovery",
- BannerModSettlementBuildingProfileSeed.MARKET,
+ SettlementBuildingProfileSeed.MARKET,
1 + governanceBoost + (marketState.marketCount() - marketState.openMarketCount()),
governedSettlement,
claimedSettlement,
@@ -948,11 +905,11 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
);
}
- BannerModSettlementProjectCandidateSeed foodCandidate = buildProfilePressureCandidate(
+ SettlementProjectCandidateSnapshot foodCandidate = buildProfilePressureCandidate(
"food_capacity_growth",
- BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION,
+ SettlementBuildingProfileSeed.FOOD_PRODUCTION,
desiredGoodsById.getOrDefault("food", 0),
- profileCounts.getOrDefault(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, 0),
+ profileCounts.getOrDefault(SettlementBuildingProfileSeed.FOOD_PRODUCTION, 0),
governedSettlement,
claimedSettlement,
governanceBoost,
@@ -962,11 +919,11 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
return foodCandidate;
}
- BannerModSettlementProjectCandidateSeed materialCandidate = buildProfilePressureCandidate(
+ SettlementProjectCandidateSnapshot materialCandidate = buildProfilePressureCandidate(
"material_capacity_growth",
- BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION,
+ SettlementBuildingProfileSeed.MATERIAL_PRODUCTION,
desiredGoodsById.getOrDefault("materials", 0),
- profileCounts.getOrDefault(BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION, 0),
+ profileCounts.getOrDefault(SettlementBuildingProfileSeed.MATERIAL_PRODUCTION, 0),
governedSettlement,
claimedSettlement,
governanceBoost,
@@ -976,11 +933,11 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
return materialCandidate;
}
- BannerModSettlementProjectCandidateSeed constructionCandidate = buildProfilePressureCandidate(
+ SettlementProjectCandidateSnapshot constructionCandidate = buildProfilePressureCandidate(
"construction_capacity_growth",
- BannerModSettlementBuildingProfileSeed.CONSTRUCTION,
+ SettlementBuildingProfileSeed.CONSTRUCTION,
desiredGoodsById.getOrDefault("construction_materials", 0),
- profileCounts.getOrDefault(BannerModSettlementBuildingProfileSeed.CONSTRUCTION, 0),
+ profileCounts.getOrDefault(SettlementBuildingProfileSeed.CONSTRUCTION, 0),
governedSettlement,
claimedSettlement,
governanceBoost,
@@ -990,7 +947,7 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
return constructionCandidate;
}
- return new BannerModSettlementProjectCandidateSeed(
+ return new SettlementProjectCandidateSnapshot(
"none",
null,
0,
@@ -1000,11 +957,11 @@ static BannerModSettlementProjectCandidateSeed summarizeProjectCandidate(List<Ba
);
}
- static BannerModSettlementMarketState applySellerDispatchSeed(BannerModSettlementMarketState marketState,
- List<BannerModSettlementResidentRecord> residents,
- List<BannerModSettlementBuildingRecord> buildings) {
+ static SettlementMarketState applySellerDispatchSeed(SettlementMarketState marketState,
+ List<SettlementResidentRecord> residents,
+ List<SettlementBuildingRecord> buildings) {
if (marketState.markets().isEmpty() || residents.isEmpty() || buildings.isEmpty()) {
- return new BannerModSettlementMarketState(
+ return new SettlementMarketState(
marketState.marketCount(),
marketState.openMarketCount(),
marketState.totalStorageSlots(),
@@ -1016,41 +973,41 @@ static BannerModSettlementMarketState applySellerDispatchSeed(BannerModSettlemen
);
}
- Map<UUID, BannerModSettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ Map<UUID, SettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
+ for (SettlementBuildingRecord building : buildings) {
buildingsByUuid.put(building.buildingUuid(), building);
}
- Map<UUID, BannerModSettlementMarketRecord> marketsByUuid = new LinkedHashMap<>();
- for (BannerModSettlementMarketRecord market : marketState.markets()) {
+ Map<UUID, SettlementMarketRecord> marketsByUuid = new LinkedHashMap<>();
+ for (SettlementMarketRecord market : marketState.markets()) {
marketsByUuid.put(market.buildingUuid(), market);
}
- List<BannerModSettlementSellerDispatchRecord> sellerDispatches = new ArrayList<>();
+ List<SettlementSellerDispatchRecord> sellerDispatches = new ArrayList<>();
int readySellerDispatchCount = 0;
- for (BannerModSettlementResidentRecord resident : residents) {
- BannerModSettlementResidentServiceContract serviceContract = resident.serviceContract();
- if (serviceContract.actorState() != BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE
+ for (SettlementResidentRecord resident : residents) {
+ SettlementResidentServiceContract serviceContract = resident.serviceContract();
+ if (serviceContract.actorState() != SettlementServiceActorState.LOCAL_BUILDING_SERVICE
|| serviceContract.serviceBuildingUuid() == null) {
continue;
}
- BannerModSettlementBuildingRecord serviceBuilding = buildingsByUuid.get(serviceContract.serviceBuildingUuid());
- if (serviceBuilding == null || serviceBuilding.buildingProfileSeed() != BannerModSettlementBuildingProfileSeed.MARKET) {
+ SettlementBuildingRecord serviceBuilding = buildingsByUuid.get(serviceContract.serviceBuildingUuid());
+ if (serviceBuilding == null || serviceBuilding.buildingProfileSeed() != SettlementBuildingProfileSeed.MARKET) {
continue;
}
- BannerModSettlementMarketRecord market = marketsByUuid.get(serviceBuilding.buildingUuid());
+ SettlementMarketRecord market = marketsByUuid.get(serviceBuilding.buildingUuid());
if (market == null) {
continue;
}
- BannerModSettlementSellerDispatchState dispatchState = market.open()
- ? BannerModSettlementSellerDispatchState.READY
- : BannerModSettlementSellerDispatchState.MARKET_CLOSED;
- if (dispatchState == BannerModSettlementSellerDispatchState.READY) {
+ SettlementSellerDispatchState dispatchState = market.open()
+ ? SettlementSellerDispatchState.READY
+ : SettlementSellerDispatchState.MARKET_CLOSED;
+ if (dispatchState == SettlementSellerDispatchState.READY) {
readySellerDispatchCount++;
}
- sellerDispatches.add(new BannerModSettlementSellerDispatchRecord(
+ sellerDispatches.add(new SettlementSellerDispatchRecord(
resident.residentUuid(),
market.buildingUuid(),
market.marketName(),
@@ -1058,7 +1015,7 @@ static BannerModSettlementMarketState applySellerDispatchSeed(BannerModSettlemen
));
}
- return new BannerModSettlementMarketState(
+ return new SettlementMarketState(
marketState.marketCount(),
marketState.openMarketCount(),
marketState.totalStorageSlots(),
@@ -1070,12 +1027,12 @@ static BannerModSettlementMarketState applySellerDispatchSeed(BannerModSettlemen
);
}
- static BannerModSettlementMarketState collectMarketState(ServerLevel level,
+ static SettlementMarketState collectMarketState(ServerLevel level,
RecruitsClaim claim) {
- List<BannerModSettlementMarketRecord> markets = new ArrayList<>();
+ List<SettlementMarketRecord> markets = new ArrayList<>();
for (MarketArea marketArea : collectWorkAreas(level, claim, MarketArea.class)) {
marketArea.scanContainers();
- markets.add(new BannerModSettlementMarketRecord(
+ markets.add(new SettlementMarketRecord(
marketArea.getUUID(),
marketArea.getMarketName(),
marketArea.isOpen(),
@@ -1160,29 +1117,16 @@ private static void addDesiredGoodDriver(Map<String, Integer> desiredGoods, Stri
}
private static int resolveSupplyCoverageUnits(String goodId,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- Map<String, Integer> serviceCoverageByGood) {
- return resolveSupplyCoverageUnits(goodId, stockpileSummary, marketState, serviceCoverageByGood, BannerModSeaTradeSummary.summarise(List.of()));
- }
-
- private static int resolveSupplyCoverageUnits(String goodId,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- Map<String, Integer> serviceCoverageByGood,
- BannerModSeaTradeSummary.Summary seaTradeSummary) {
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ Map<String, Integer> serviceCoverageByGood,
+ BannerModSeaTradeSummary.Summary seaTradeSummary) {
int coverageUnits = serviceCoverageByGood.getOrDefault(goodId, 0);
if (goodId == null || goodId.isBlank()) {
return coverageUnits;
}
- if (goodId.startsWith("sea_import:")) {
- ResourceLocation itemId = ResourceLocation.tryParse(goodId.substring("sea_import:".length()));
- return coverageUnits + BannerModSeaTradeSummary.totalImportableCount(seaTradeSummary, itemId);
- }
- if (goodId.startsWith("sea_export:")) {
- ResourceLocation itemId = ResourceLocation.tryParse(goodId.substring("sea_export:".length()));
- return coverageUnits + BannerModSeaTradeSummary.totalExportableCount(seaTradeSummary, itemId);
- }
+
+ coverageUnits = SettlementSeaTradeAnalyzer.addCoverageUnits(goodId, coverageUnits, seaTradeSummary);
if (goodId.startsWith("storage_type:")) {
String storageTypeId = goodId.substring("storage_type:".length());
if (stockpileSummary.authoredStorageTypeIds().contains(storageTypeId)) {
@@ -1190,6 +1134,7 @@ private static int resolveSupplyCoverageUnits(String goodId,
}
return coverageUnits;
}
+
return switch (goodId) {
case "market_goods" -> coverageUnits + marketState.readySellerDispatchCount();
case "trade_stock" -> coverageUnits + marketState.openMarketCount() + stockpileSummary.portEntrypointCount();
@@ -1197,78 +1142,7 @@ private static int resolveSupplyCoverageUnits(String goodId,
};
}
- static List<String> seaTradeStatusLines(BannerModSeaTradeSummary.Summary seaTradeSummary,
- List<BannerModSeaTradeExecutionRecord> executionRecords) {
- List<String> lines = new ArrayList<>();
- for (BannerModSeaTradeExecutionRecord record : executionRecords) {
- lines.add(seaTradeExecutionStatusLine(record));
- }
- for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.importableByItem().entrySet()) {
- lines.add("Sea import benefit: " + entry.getKey() + " x" + entry.getValue());
- }
- for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.exportableByItem().entrySet()) {
- lines.add("Sea export benefit: " + entry.getKey() + " x" + entry.getValue());
- }
- for (String bottleneck : seaTradeSummary.bottlenecks()) {
- lines.add("Sea trade bottleneck: " + bottleneck.toLowerCase(Locale.ROOT));
- }
- return lines;
- }
-
- private static List<String> seaTradeStatusLines(BannerModSeaTradeSummary.Summary seaTradeSummary) {
- return seaTradeStatusLines(seaTradeSummary, List.of());
- }
-
- private static String seaTradeExecutionStatusLine(BannerModSeaTradeExecutionRecord record) {
- String statusKey = switch (record.state()) {
- case LOADING -> "loading";
- case TRAVELLING -> "travelling";
- case UNLOADING -> "unloading";
- case COMPLETE -> "completed";
- case FAILED -> BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER.equals(record.failureReason())
- ? "missing_ship"
- : "blocked_cargo";
- };
- return "gui.bannermod.governor.logistics.sea_trade." + statusKey + " "
- + shortRouteId(record.routeId()) + " "
- + carrierLabel(record.boundCarrierId()) + " "
- + failureReasonKey(record.failureReason()) + " "
- + seaTradeFilterLabel(record) + " "
- + record.cargoCount() + " "
- + record.requestedCount();
- }
-
- private static String carrierLabel(@Nullable UUID carrierId) {
- return carrierId == null ? "unassigned" : shortRouteId(carrierId);
- }
-
- private static String failureReasonKey(String failureReason) {
- if (failureReason == null || failureReason.isBlank()) {
- return "gui.bannermod.governor.logistics.sea_trade.reason.none";
- }
- return switch (failureReason) {
- case BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER -> "gui.bannermod.governor.logistics.sea_trade.reason.no_carrier";
- case BannerModSeaTradeExecutionRecord.FAILURE_NO_CARGO_LOADED -> "gui.bannermod.governor.logistics.sea_trade.reason.no_cargo_loaded";
- case BannerModSeaTradeExecutionRecord.FAILURE_SOURCE_SHORTAGE -> "gui.bannermod.governor.logistics.sea_trade.reason.source_shortage";
- case BannerModSeaTradeExecutionRecord.FAILURE_DESTINATION_FULL -> "gui.bannermod.governor.logistics.sea_trade.reason.destination_full";
- default -> "gui.bannermod.governor.logistics.sea_trade.reason.carrier_failed";
- };
- }
-
- private static String shortRouteId(UUID routeId) {
- String value = routeId.toString().replace("-", "");
- return value.substring(Math.max(0, value.length() - 4));
- }
-
- private static String seaTradeFilterLabel(BannerModSeaTradeExecutionRecord record) {
- return record.filter().itemIds().stream()
- .sorted(Comparator.comparing(ResourceLocation::toString))
- .map(ResourceLocation::toString)
- .findFirst()
- .orElse("any");
- }
-
- private static String desiredGoodIdForProfile(BannerModSettlementBuildingProfileSeed profileSeed) {
+ private static String desiredGoodIdForProfile(SettlementBuildingProfileSeed profileSeed) {
return switch (profileSeed) {
case FOOD_PRODUCTION -> "food";
case MATERIAL_PRODUCTION -> "materials";
@@ -1278,8 +1152,8 @@ private static String desiredGoodIdForProfile(BannerModSettlementBuildingProfile
};
}
- private static BannerModSettlementProjectCandidateSeed buildProfilePressureCandidate(String candidateId,
- BannerModSettlementBuildingProfileSeed targetProfileSeed,
+ private static SettlementProjectCandidateSnapshot buildProfilePressureCandidate(String candidateId,
+ SettlementBuildingProfileSeed targetProfileSeed,
int desiredCount,
int currentCount,
boolean governedSettlement,
@@ -1288,9 +1162,9 @@ private static BannerModSettlementProjectCandidateSeed buildProfilePressureCandi
List<String> driverIds) {
int pressure = desiredCount - currentCount;
if (pressure <= 0) {
- return BannerModSettlementProjectCandidateSeed.empty();
+ return SettlementProjectCandidateSnapshot.empty();
}
- return new BannerModSettlementProjectCandidateSeed(
+ return new SettlementProjectCandidateSnapshot(
candidateId,
targetProfileSeed,
Math.min(5, governanceBoost + pressure),
@@ -1300,15 +1174,15 @@ private static BannerModSettlementProjectCandidateSeed buildProfilePressureCandi
);
}
- static ReservationSignalSeed summarizeReservationSignalSeed(List<BannerModSettlementBuildingRecord> buildings,
+ static ReservationSignalSeed summarizeReservationSignalSeed(List<SettlementBuildingRecord> buildings,
List<BannerModLogisticsRoute> localRoutes,
List<BannerModLogisticsReservation> reservations) {
if (buildings.isEmpty() || localRoutes.isEmpty() || reservations.isEmpty()) {
return ReservationSignalSeed.empty();
}
- Map<UUID, BannerModSettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
- for (BannerModSettlementBuildingRecord building : buildings) {
+ Map<UUID, SettlementBuildingRecord> buildingsByUuid = new LinkedHashMap<>();
+ for (SettlementBuildingRecord building : buildings) {
buildingsByUuid.put(building.buildingUuid(), building);
}
@@ -1326,8 +1200,8 @@ static ReservationSignalSeed summarizeReservationSignalSeed(List<BannerModSettle
continue;
}
- BannerModSettlementBuildingRecord sourceBuilding = buildingsByUuid.get(route.source().storageAreaId());
- BannerModSettlementBuildingRecord destinationBuilding = buildingsByUuid.get(route.destination().storageAreaId());
+ SettlementBuildingRecord sourceBuilding = buildingsByUuid.get(route.source().storageAreaId());
+ SettlementBuildingRecord destinationBuilding = buildingsByUuid.get(route.destination().storageAreaId());
activeReservationCount++;
reservedUnitCount += reservation.reservedCount();
@@ -1350,7 +1224,7 @@ static ReservationSignalSeed summarizeReservationSignalSeed(List<BannerModSettle
}
private static void collectReservationGoodIds(Set<String> goodIds,
- @Nullable BannerModSettlementBuildingRecord building) {
+ @Nullable SettlementBuildingRecord building) {
if (building == null) {
return;
}
@@ -1361,11 +1235,11 @@ private static void collectReservationGoodIds(Set<String> goodIds,
}
}
- private static boolean isMerchantStockpile(@Nullable BannerModSettlementBuildingRecord building) {
+ private static boolean isMerchantStockpile(@Nullable SettlementBuildingRecord building) {
return building != null && building.stockpileTypeIds().contains("merchants");
}
- private static boolean isPortEntrypoint(@Nullable BannerModSettlementBuildingRecord building) {
+ private static boolean isPortEntrypoint(@Nullable SettlementBuildingRecord building) {
return building != null && building.stockpilePortEntrypoint();
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementStockpileSummary.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementStockpileSummary.java
similarity index 85%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementStockpileSummary.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementStockpileSummary.java
index dd2cf7e8..1f1807a6 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementStockpileSummary.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementStockpileSummary.java
@@ -8,7 +8,7 @@
import java.util.ArrayList;
import java.util.List;
-public record BannerModSettlementStockpileSummary(
+public record SettlementStockpileSummary(
int storageBuildingCount,
int containerCount,
int slotCapacity,
@@ -16,7 +16,7 @@ public record BannerModSettlementStockpileSummary(
int portEntrypointCount,
List<String> authoredStorageTypeIds
) {
- public BannerModSettlementStockpileSummary {
+ public SettlementStockpileSummary {
storageBuildingCount = Math.max(0, storageBuildingCount);
containerCount = Math.max(0, containerCount);
slotCapacity = Math.max(0, slotCapacity);
@@ -42,8 +42,8 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementStockpileSummary fromTag(CompoundTag tag) {
- return new BannerModSettlementStockpileSummary(
+ public static SettlementStockpileSummary fromTag(CompoundTag tag) {
+ return new SettlementStockpileSummary(
tag.getInt("StorageBuildingCount"),
tag.getInt("ContainerCount"),
tag.getInt("SlotCapacity"),
@@ -53,8 +53,8 @@ public static BannerModSettlementStockpileSummary fromTag(CompoundTag tag) {
);
}
- public static BannerModSettlementStockpileSummary empty() {
- return new BannerModSettlementStockpileSummary(0, 0, 0, 0, 0, List.of());
+ public static SettlementStockpileSummary empty() {
+ return new SettlementStockpileSummary(0, 0, 0, 0, 0, List.of());
}
private static List<String> readStorageTypeIds(ListTag list) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignals.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementStrategicSignals.java
similarity index 81%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignals.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementStrategicSignals.java
index 27cfea69..4d43877f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignals.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementStrategicSignals.java
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.Locale;
-public record BannerModSettlementStrategicSignals(
+public record SettlementStrategicSignals(
String roleId,
String roleDescription,
String routeCostId,
@@ -14,7 +14,7 @@ public record BannerModSettlementStrategicSignals(
List<String> logisticsObjectiveIds,
List<String> loyaltyPressureIds
) {
- public BannerModSettlementStrategicSignals {
+ public SettlementStrategicSignals {
roleId = normalize(roleId, "outpost");
roleDescription = blankToDefault(roleDescription, "Local outpost with no dominant logistics role yet.");
routeCostId = normalize(routeCostId, "isolated");
@@ -25,13 +25,13 @@ public record BannerModSettlementStrategicSignals(
loyaltyPressureIds = List.copyOf(loyaltyPressureIds == null ? List.of() : loyaltyPressureIds);
}
- public static BannerModSettlementStrategicSignals fromSnapshot(BannerModSettlementSnapshot snapshot) {
+ public static SettlementStrategicSignals fromSnapshot(SettlementSnapshot snapshot) {
if (snapshot == null) {
return empty();
}
- int foodBuildings = countProfile(snapshot, BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION);
- int materialBuildings = countProfile(snapshot, BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION);
+ int foodBuildings = countProfile(snapshot, SettlementBuildingProfileSeed.FOOD_PRODUCTION);
+ int materialBuildings = countProfile(snapshot, SettlementBuildingProfileSeed.MATERIAL_PRODUCTION);
int storageCount = snapshot.stockpileSummary().storageBuildingCount();
int routedStorageCount = snapshot.stockpileSummary().routedStorageCount();
int portCount = snapshot.stockpileSummary().portEntrypointCount();
@@ -108,16 +108,16 @@ public static BannerModSettlementStrategicSignals fromSnapshot(BannerModSettleme
pressures.add("no_local_distribution");
}
- return new BannerModSettlementStrategicSignals(roleId, roleDescription, routeCostId, routeCostDescription, specializationId, specializationDescription, objectives, pressures);
+ return new SettlementStrategicSignals(roleId, roleDescription, routeCostId, routeCostDescription, specializationId, specializationDescription, objectives, pressures);
}
- public static BannerModSettlementStrategicSignals empty() {
- return new BannerModSettlementStrategicSignals("outpost", "No settlement logistics snapshot is available.", "unknown", "Route cost is unknown.", "none", "No specialization is visible.", List.of(), List.of());
+ public static SettlementStrategicSignals empty() {
+ return new SettlementStrategicSignals("outpost", "No settlement logistics snapshot is available.", "unknown", "Route cost is unknown.", "none", "No specialization is visible.", List.of(), List.of());
}
- private static int countProfile(BannerModSettlementSnapshot snapshot, BannerModSettlementBuildingProfileSeed profileSeed) {
+ private static int countProfile(SettlementSnapshot snapshot, SettlementBuildingProfileSeed profileSeed) {
int count = 0;
- for (BannerModSettlementBuildingRecord building : snapshot.buildings()) {
+ for (SettlementBuildingRecord building : snapshot.buildings()) {
if (building.buildingProfileSeed() == profileSeed) {
count++;
}
@@ -125,8 +125,8 @@ private static int countProfile(BannerModSettlementSnapshot snapshot, BannerModS
return count;
}
- private static boolean hasBuildingPath(BannerModSettlementSnapshot snapshot, String path) {
- for (BannerModSettlementBuildingRecord building : snapshot.buildings()) {
+ private static boolean hasBuildingPath(SettlementSnapshot snapshot, String path) {
+ for (SettlementBuildingRecord building : snapshot.buildings()) {
String typeId = building.buildingTypeId();
if (typeId != null && typeId.toLowerCase(Locale.ROOT).endsWith(path)) {
return true;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSupplySignal.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSupplySignal.java
similarity index 85%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSupplySignal.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSupplySignal.java
index dfbfee32..5857f813 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSupplySignal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSupplySignal.java
@@ -3,14 +3,14 @@
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
-public record BannerModSettlementSupplySignal(
+public record SettlementSupplySignal(
String goodId,
int desiredUnits,
int coverageUnits,
int shortageUnits,
int reservationHintUnits
) {
- public BannerModSettlementSupplySignal {
+ public SettlementSupplySignal {
goodId = goodId == null ? "" : goodId;
desiredUnits = Math.max(0, desiredUnits);
coverageUnits = Math.max(0, coverageUnits);
@@ -30,8 +30,8 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementSupplySignal fromTag(CompoundTag tag) {
- return new BannerModSettlementSupplySignal(
+ public static SettlementSupplySignal fromTag(CompoundTag tag) {
+ return new SettlementSupplySignal(
tag.contains("GoodId", Tag.TAG_STRING) ? tag.getString("GoodId") : "",
tag.getInt("DesiredUnits"),
tag.getInt("CoverageUnits"),
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSupplySignalState.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementSupplySignalState.java
similarity index 67%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSupplySignalState.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementSupplySignalState.java
index 39dfe397..4b322625 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementSupplySignalState.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementSupplySignalState.java
@@ -7,14 +7,14 @@
import java.util.ArrayList;
import java.util.List;
-public record BannerModSettlementSupplySignalState(
+public record SettlementSupplySignalState(
int signalCount,
int shortageSignalCount,
int shortageUnitCount,
int reservationHintUnitCount,
- List<BannerModSettlementSupplySignal> signals
+ List<SettlementSupplySignal> signals
) {
- public BannerModSettlementSupplySignalState {
+ public SettlementSupplySignalState {
signalCount = Math.max(0, signalCount);
shortageSignalCount = Math.max(0, Math.min(shortageSignalCount, signalCount));
shortageUnitCount = Math.max(0, shortageUnitCount);
@@ -29,15 +29,15 @@ public CompoundTag toTag() {
tag.putInt("ShortageUnitCount", this.shortageUnitCount);
tag.putInt("ReservationHintUnitCount", this.reservationHintUnitCount);
ListTag signalList = new ListTag();
- for (BannerModSettlementSupplySignal signal : this.signals) {
+ for (SettlementSupplySignal signal : this.signals) {
signalList.add(signal.toTag());
}
tag.put("Signals", signalList);
return tag;
}
- public static BannerModSettlementSupplySignalState fromTag(CompoundTag tag) {
- return new BannerModSettlementSupplySignalState(
+ public static SettlementSupplySignalState fromTag(CompoundTag tag) {
+ return new SettlementSupplySignalState(
tag.getInt("SignalCount"),
tag.getInt("ShortageSignalCount"),
tag.getInt("ShortageUnitCount"),
@@ -46,14 +46,14 @@ public static BannerModSettlementSupplySignalState fromTag(CompoundTag tag) {
);
}
- public static BannerModSettlementSupplySignalState empty() {
- return new BannerModSettlementSupplySignalState(0, 0, 0, 0, List.of());
+ public static SettlementSupplySignalState empty() {
+ return new SettlementSupplySignalState(0, 0, 0, 0, List.of());
}
- private static List<BannerModSettlementSupplySignal> readSignals(ListTag list) {
- List<BannerModSettlementSupplySignal> signals = new ArrayList<>();
+ private static List<SettlementSupplySignal> readSignals(ListTag list) {
+ List<SettlementSupplySignal> signals = new ArrayList<>();
for (Tag entry : list) {
- signals.add(BannerModSettlementSupplySignal.fromTag((CompoundTag) entry));
+ signals.add(SettlementSupplySignal.fromTag((CompoundTag) entry));
}
return signals;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementTradeRouteHandoffSeed.java b/src/main/java/com/talhanation/bannermod/settlement/SettlementTradeRouteHandoffSnapshot.java
similarity index 72%
rename from src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementTradeRouteHandoffSeed.java
rename to src/main/java/com/talhanation/bannermod/settlement/SettlementTradeRouteHandoffSnapshot.java
index 816556a6..976c25c8 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/BannerModSettlementTradeRouteHandoffSeed.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/SettlementTradeRouteHandoffSnapshot.java
@@ -8,18 +8,18 @@
import java.util.ArrayList;
import java.util.List;
-public record BannerModSettlementTradeRouteHandoffSeed(
+public record SettlementTradeRouteHandoffSnapshot(
int sellerDispatchCount,
int readySellerDispatchCount,
int routedStorageCount,
int portEntrypointCount,
int activeReservationCount,
int reservedUnitCount,
- List<BannerModSettlementDesiredGoodSeed> desiredGoods,
- List<BannerModSettlementSellerDispatchRecord> sellerDispatches,
+ List<SettlementDesiredGoodSnapshot> desiredGoods,
+ List<SettlementSellerDispatchRecord> sellerDispatches,
List<String> seaTradeStatusLines
) {
- public BannerModSettlementTradeRouteHandoffSeed {
+ public SettlementTradeRouteHandoffSnapshot {
sellerDispatchCount = Math.max(0, sellerDispatchCount);
readySellerDispatchCount = Math.max(0, Math.min(readySellerDispatchCount, sellerDispatchCount));
routedStorageCount = Math.max(0, routedStorageCount);
@@ -41,13 +41,13 @@ public CompoundTag toTag() {
tag.putInt("ReservedUnitCount", this.reservedUnitCount);
ListTag desiredGoodsList = new ListTag();
- for (BannerModSettlementDesiredGoodSeed desiredGood : this.desiredGoods) {
+ for (SettlementDesiredGoodSnapshot desiredGood : this.desiredGoods) {
desiredGoodsList.add(desiredGood.toTag());
}
tag.put("DesiredGoods", desiredGoodsList);
ListTag sellerDispatchList = new ListTag();
- for (BannerModSettlementSellerDispatchRecord sellerDispatch : this.sellerDispatches) {
+ for (SettlementSellerDispatchRecord sellerDispatch : this.sellerDispatches) {
sellerDispatchList.add(sellerDispatch.toTag());
}
tag.put("SellerDispatches", sellerDispatchList);
@@ -60,8 +60,8 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementTradeRouteHandoffSeed fromTag(CompoundTag tag) {
- return new BannerModSettlementTradeRouteHandoffSeed(
+ public static SettlementTradeRouteHandoffSnapshot fromTag(CompoundTag tag) {
+ return new SettlementTradeRouteHandoffSnapshot(
tag.getInt("SellerDispatchCount"),
tag.getInt("ReadySellerDispatchCount"),
tag.getInt("RoutedStorageCount"),
@@ -74,22 +74,22 @@ public static BannerModSettlementTradeRouteHandoffSeed fromTag(CompoundTag tag)
);
}
- public static BannerModSettlementTradeRouteHandoffSeed empty() {
- return new BannerModSettlementTradeRouteHandoffSeed(0, 0, 0, 0, 0, 0, List.of(), List.of(), List.of());
+ public static SettlementTradeRouteHandoffSnapshot empty() {
+ return new SettlementTradeRouteHandoffSnapshot(0, 0, 0, 0, 0, 0, List.of(), List.of(), List.of());
}
- private static List<BannerModSettlementDesiredGoodSeed> readDesiredGoods(ListTag list) {
- List<BannerModSettlementDesiredGoodSeed> desiredGoods = new ArrayList<>();
+ private static List<SettlementDesiredGoodSnapshot> readDesiredGoods(ListTag list) {
+ List<SettlementDesiredGoodSnapshot> desiredGoods = new ArrayList<>();
for (Tag entry : list) {
- desiredGoods.add(BannerModSettlementDesiredGoodSeed.fromTag((CompoundTag) entry));
+ desiredGoods.add(SettlementDesiredGoodSnapshot.fromTag((CompoundTag) entry));
}
return desiredGoods;
}
- private static List<BannerModSettlementSellerDispatchRecord> readSellerDispatches(ListTag list) {
- List<BannerModSettlementSellerDispatchRecord> sellerDispatches = new ArrayList<>();
+ private static List<SettlementSellerDispatchRecord> readSellerDispatches(ListTag list) {
+ List<SettlementSellerDispatchRecord> sellerDispatches = new ArrayList<>();
for (Tag entry : list) {
- sellerDispatches.add(BannerModSettlementSellerDispatchRecord.fromTag((CompoundTag) entry));
+ sellerDispatches.add(SettlementSellerDispatchRecord.fromTag((CompoundTag) entry));
}
return sellerDispatches;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/civilian/runtime/WorkerSettlementClaimPolicy.java b/src/main/java/com/talhanation/bannermod/settlement/civilian/runtime/WorkerSettlementClaimPolicy.java
index dc06a388..56a58ee9 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/civilian/runtime/WorkerSettlementClaimPolicy.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/civilian/runtime/WorkerSettlementClaimPolicy.java
@@ -15,10 +15,10 @@
import com.talhanation.bannermod.entity.military.RecruitPoliticalContext;
import com.talhanation.bannermod.events.ClaimEvents;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.settlement.civilian.WorkerSettlementSpawnRules;
import com.talhanation.bannermod.settlement.civilian.WorkerSettlementSpawner;
import com.talhanation.bannermod.settlement.household.BannerModHomeAssignmentRuntime;
@@ -205,13 +205,13 @@ public static int housingSlackForClaim(ServerLevel level, RecruitsClaim claim) {
if (level == null || claim == null) {
return 0;
}
- BannerModSettlementSnapshot snapshot = BannerModSettlementManager.get(level).getSnapshot(claim.getUUID());
+ SettlementSnapshot snapshot = SettlementManager.get(level).getSnapshot(claim.getUUID());
if (snapshot == null) {
return 0;
}
BannerModHomeAssignmentRuntime runtime = BannerModHomeAssignmentSavedData.get(level).runtime();
int slack = 0;
- for (BannerModSettlementBuildingRecord building : snapshot.buildings()) {
+ for (SettlementBuildingRecord building : snapshot.buildings()) {
if (!isHousingCategory(building.buildingCategory())) {
continue;
}
@@ -272,12 +272,12 @@ public static void assignHomeIfAvailable(ServerLevel level, RecruitsClaim claim,
if (level == null || claim == null || residentUuid == null) {
return;
}
- BannerModSettlementSnapshot snapshot = BannerModSettlementManager.get(level).getSnapshot(claim.getUUID());
+ SettlementSnapshot snapshot = SettlementManager.get(level).getSnapshot(claim.getUUID());
if (snapshot == null) {
return;
}
BannerModHomeAssignmentRuntime runtime = BannerModHomeAssignmentSavedData.get(level).runtime();
- for (BannerModSettlementBuildingRecord building : snapshot.buildings()) {
+ for (SettlementBuildingRecord building : snapshot.buildings()) {
if (!isHousingCategory(building.buildingCategory())) {
continue;
}
@@ -295,8 +295,8 @@ public static void assignHomeIfAvailable(ServerLevel level, RecruitsClaim claim,
}
}
- private static boolean isHousingCategory(BannerModSettlementBuildingCategory category) {
- return category == BannerModSettlementBuildingCategory.GENERAL;
+ private static boolean isHousingCategory(SettlementBuildingCategory category) {
+ return category == SettlementBuildingCategory.GENERAL;
}
@Nullable
diff --git a/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisor.java b/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisor.java
index 45ca6f05..ca2c1fb2 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisor.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisor.java
@@ -1,8 +1,8 @@
package com.talhanation.bannermod.settlement.dispatch;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchState;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchRecord;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchState;
import java.util.Optional;
import java.util.UUID;
@@ -13,14 +13,14 @@
* pulled into a dispatch, or {@link Optional#empty()} if nothing is eligible.
*
* <p>Deterministic by construction: iteration order is the order returned by
- * {@link BannerModSettlementMarketState#sellerDispatches()} (itself a
+ * {@link SettlementMarketState#sellerDispatches()} (itself a
* {@link java.util.List}, so insertion order is preserved through
* {@link java.util.List#copyOf(java.util.Collection)}).
*
* <p>Note on the parameter name: slice A's spec labels the persisted seed
* "SellerDispatchState" as a bag of records, but in the shipped code that
* name is already taken by an enum (READY / MARKET_CLOSED). The bag of
- * records actually lives on {@link BannerModSettlementMarketState}, so that
+ * records actually lives on {@link SettlementMarketState}, so that
* is what this advisor consumes. The enum is used only to filter the list.
*/
public final class BannerModSellerDispatchAdvisor {
@@ -33,11 +33,11 @@ private BannerModSellerDispatchAdvisor() {
* @param runtime in-memory phase tracker
* @param gameTime current game time (ticks); unused today, taken for forward-compat
* so callers don't have to re-thread state when future scoring lands
- * @return the first {@link BannerModSettlementSellerDispatchState#READY} resident UUID
+ * @return the first {@link SettlementSellerDispatchState#READY} resident UUID
* that is not currently active in {@code runtime}, or empty
*/
public static Optional<UUID> pickReadySeller(
- BannerModSettlementMarketState marketState,
+ SettlementMarketState marketState,
BannerModSellerDispatchRuntime runtime,
long gameTime
) {
@@ -49,11 +49,11 @@ public static Optional<UUID> pickReadySeller(
if (gameTime < Long.MIN_VALUE) {
return Optional.empty();
}
- for (BannerModSettlementSellerDispatchRecord record : marketState.sellerDispatches()) {
+ for (SettlementSellerDispatchRecord record : marketState.sellerDispatches()) {
if (record == null) {
continue;
}
- if (record.dispatchState() != BannerModSettlementSellerDispatchState.READY) {
+ if (record.dispatchState() != SettlementSellerDispatchState.READY) {
continue;
}
UUID residentUuid = record.residentUuid();
diff --git a/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchRuntime.java b/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchRuntime.java
index c34ecfe4..dd8890ca 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchRuntime.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchRuntime.java
@@ -18,7 +18,7 @@
/**
* In-memory coordinator for live seller dispatches. Takes the persisted
- * {@link com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchState#READY}
+ * {@link com.talhanation.bannermod.settlement.SettlementSellerDispatchState#READY}
* seed and drives a per-seller phase machine through MOVING_TO_STALL ->
* AT_STALL -> SELLING -> RETURNING -> RETURNED. Phase advances can be driven
* explicitly via {@link #advance(UUID, SellerPhase, long)} or implicitly via
diff --git a/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerPhase.java b/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerPhase.java
index 79b37d41..5347e5ef 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerPhase.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerPhase.java
@@ -2,7 +2,7 @@
/**
* Live state of a single seller-dispatch flight. The scheduler-facing
- * {@code READY} value mirrors {@code BannerModSettlementSellerDispatchState.READY}
+ * {@code READY} value mirrors {@code SettlementSellerDispatchState.READY}
* (seed state, nothing in flight), while the rest track the in-memory progression
* driven by {@link BannerModSellerDispatchRuntime} once {@code beginDispatch} fires.
*
diff --git a/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerResidentGoal.java
index 7fc04d1b..8e72e0bc 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/dispatch/SellerResidentGoal.java
@@ -1,11 +1,11 @@
package com.talhanation.bannermod.settlement.dispatch;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentServiceContract;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchState;
-import com.talhanation.bannermod.settlement.BannerModSettlementServiceActorState;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementResidentServiceContract;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchRecord;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchState;
+import com.talhanation.bannermod.settlement.SettlementServiceActorState;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -26,17 +26,17 @@
* <ul>
* <li>Resident must hold a market-profile service contract
* (actor state == LOCAL_BUILDING_SERVICE).</li>
- * <li>A {@link BannerModSettlementSellerDispatchRecord} with
- * {@link BannerModSettlementSellerDispatchState#READY} and a matching
+ * <li>A {@link SettlementSellerDispatchRecord} with
+ * {@link SettlementSellerDispatchState#READY} and a matching
* resident UUID must exist in the supplied market state.</li>
* <li>The runtime must not already have the seller in a non-idle phase.</li>
* </ul>
*
* <p>FIXME(marketStateSupplier): the spec reads
- * {@code Supplier<BannerModSettlementSellerDispatchState>} but the shipped
+ * {@code Supplier<SettlementSellerDispatchState>} but the shipped
* name is an enum (READY / MARKET_CLOSED); the actual bag of seed records
- * lives on {@link BannerModSettlementMarketState}, so we take a
- * {@code Supplier<BannerModSettlementMarketState>} here. A later slice can
+ * lives on {@link SettlementMarketState}, so we take a
+ * {@code Supplier<SettlementMarketState>} here. A later slice can
* replace this with a dedicated facade if naming ambiguity bites.
*/
public final class SellerResidentGoal implements ResidentGoal {
@@ -58,7 +58,7 @@ public final class SellerResidentGoal implements ResidentGoal {
+ BannerModSellerDispatchRuntime.SELLING_MAX_TICKS
+ BannerModSellerDispatchRuntime.RETURNING_MAX_TICKS;
- private final Supplier<BannerModSettlementMarketState> marketStateSupplier;
+ private final Supplier<SettlementMarketState> marketStateSupplier;
private final BannerModSellerDispatchRuntime runtime;
/**
@@ -66,16 +66,16 @@ public final class SellerResidentGoal implements ResidentGoal {
* concrete supplier to the settlement manager's live state.
*/
public SellerResidentGoal() {
- this(BannerModSettlementMarketState::empty, new BannerModSellerDispatchRuntime());
+ this(SettlementMarketState::empty, new BannerModSellerDispatchRuntime());
}
public SellerResidentGoal(
- Supplier<BannerModSettlementMarketState> marketStateSupplier,
+ Supplier<SettlementMarketState> marketStateSupplier,
BannerModSellerDispatchRuntime runtime
) {
this.marketStateSupplier = marketStateSupplier != null
? marketStateSupplier
- : BannerModSettlementMarketState::empty;
+ : SettlementMarketState::empty;
this.runtime = runtime != null ? runtime : new BannerModSellerDispatchRuntime();
}
@@ -132,20 +132,20 @@ public int cooldownTicks() {
@Nullable
private UUID findReadyMarketUuid(ResidentGoalContext ctx) {
- BannerModSettlementResidentServiceContract contract = ctx.resident().serviceContract();
- if (contract == null || contract.actorState() != BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE) {
+ SettlementResidentServiceContract contract = ctx.resident().serviceContract();
+ if (contract == null || contract.actorState() != SettlementServiceActorState.LOCAL_BUILDING_SERVICE) {
return null;
}
- BannerModSettlementMarketState state = this.marketStateSupplier.get();
+ SettlementMarketState state = this.marketStateSupplier.get();
if (state == null) {
return null;
}
UUID residentUuid = ctx.residentId();
- for (BannerModSettlementSellerDispatchRecord record : state.sellerDispatches()) {
+ for (SettlementSellerDispatchRecord record : state.sellerDispatches()) {
if (record == null) {
continue;
}
- if (record.dispatchState() != BannerModSettlementSellerDispatchState.READY) {
+ if (record.dispatchState() != SettlementSellerDispatchState.READY) {
continue;
}
if (residentUuid.equals(record.residentUuid())) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalScheduler.java b/src/main/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalScheduler.java
index 54daa8d4..92fb3e7f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalScheduler.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalScheduler.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement.goal;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
import com.talhanation.bannermod.settlement.dispatch.BannerModSellerDispatchRuntime;
import com.talhanation.bannermod.settlement.dispatch.SellerResidentGoal;
import com.talhanation.bannermod.settlement.goal.impl.DeliverResidentGoal;
@@ -67,7 +67,7 @@ public static BannerModResidentGoalScheduler withDefaultGoals() {
*/
public static BannerModResidentGoalScheduler withDefaultGoals(
BannerModHomeAssignmentRuntime homeAssignmentRuntime,
- Supplier<BannerModSettlementMarketState> marketStateSupplier,
+ Supplier<SettlementMarketState> marketStateSupplier,
BannerModSellerDispatchRuntime sellerDispatchRuntime
) {
if (homeAssignmentRuntime == null) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/goal/ResidentGoalContext.java b/src/main/java/com/talhanation/bannermod/settlement/goal/ResidentGoalContext.java
index d6080e16..9c48e78b 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/goal/ResidentGoalContext.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/goal/ResidentGoalContext.java
@@ -1,16 +1,16 @@
package com.talhanation.bannermod.settlement.goal;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentSchedulePolicy;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleWindowSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementResidentSchedulePolicy;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleWindowSeed;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import javax.annotation.Nullable;
import java.util.UUID;
public record ResidentGoalContext(
- BannerModSettlementResidentRecord resident,
- @Nullable BannerModSettlementSnapshot settlement,
+ SettlementResidentRecord resident,
+ @Nullable SettlementSnapshot settlement,
long gameTime
) {
@@ -18,11 +18,11 @@ public UUID residentId() {
return this.resident.residentUuid();
}
- public BannerModSettlementResidentSchedulePolicy policy() {
+ public SettlementResidentSchedulePolicy policy() {
return this.resident.schedulePolicy();
}
- public BannerModSettlementResidentScheduleWindowSeed window() {
+ public SettlementResidentScheduleWindowSeed window() {
return this.resident.scheduleWindowSeed();
}
@@ -38,14 +38,14 @@ public int dayTime() {
/** True when within the policy-defined active window of the current day. */
public boolean isActivePhase() {
int t = this.dayTime();
- BannerModSettlementResidentScheduleWindowSeed w = this.window();
+ SettlementResidentScheduleWindowSeed w = this.window();
return t >= w.activeStartTick() && t < w.activeEndTick();
}
/** True when within the policy-defined rest window of the current day. */
public boolean isRestPhase() {
int t = this.dayTime();
- BannerModSettlementResidentScheduleWindowSeed w = this.window();
+ SettlementResidentScheduleWindowSeed w = this.window();
return t >= w.restStartTick() || t < w.activeStartTick();
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/DeliverResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/DeliverResidentGoal.java
index ba4c11f0..d06de770 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/DeliverResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/DeliverResidentGoal.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.goal.impl;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -37,7 +37,7 @@ public boolean canStart(ResidentGoalContext ctx) {
if (ctx.resident().boundWorkAreaUuid() == null) {
return false;
}
- return ctx.resident().assignmentState() == BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
+ return ctx.resident().assignmentState() == SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
}
@Override
diff --git a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/FetchResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/FetchResidentGoal.java
index fe7513cc..2e442b22 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/FetchResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/FetchResidentGoal.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.goal.impl;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -38,7 +38,7 @@ public boolean canStart(ResidentGoalContext ctx) {
if (ctx.resident().boundWorkAreaUuid() == null) {
return false;
}
- return ctx.resident().assignmentState() == BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
+ return ctx.resident().assignmentState() == SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING;
}
@Override
diff --git a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/SocialiseResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/SocialiseResidentGoal.java
index 1c3fb579..a29a7c3c 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/SocialiseResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/SocialiseResidentGoal.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.goal.impl;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleWindowSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleWindowSeed;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -26,8 +26,8 @@ public int computePriority(ResidentGoalContext ctx) {
if (!ctx.isActivePhase()) {
return 0;
}
- return ctx.window() == BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY
- || ctx.window() == BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX
+ return ctx.window() == SettlementResidentScheduleWindowSeed.CIVIC_DAY
+ || ctx.window() == SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX
? SOCIALISE_PRIORITY
: 0;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/WorkResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/WorkResidentGoal.java
index 6c6694a2..0b59cf02 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/goal/impl/WorkResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/goal/impl/WorkResidentGoal.java
@@ -1,8 +1,8 @@
package com.talhanation.bannermod.settlement.goal.impl;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRole;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentRole;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -35,12 +35,12 @@ public boolean canStart(ResidentGoalContext ctx) {
if (!ctx.isActivePhase()) {
return false;
}
- if (ctx.resident().role() == BannerModSettlementResidentRole.GOVERNOR_RECRUIT) {
+ if (ctx.resident().role() == SettlementResidentRole.GOVERNOR_RECRUIT) {
return false;
}
- BannerModSettlementResidentAssignmentState state = ctx.resident().assignmentState();
- return state == BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
- || state == BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING;
+ SettlementResidentAssignmentState state = ctx.resident().assignmentState();
+ return state == SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ || state == SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING;
}
@Override
diff --git a/src/main/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContext.java b/src/main/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContext.java
deleted file mode 100644
index 0908f122..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContext.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package com.talhanation.bannermod.settlement.growth;
-
-import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodsSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementStockpileSummary;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignalState;
-import com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed;
-
-import javax.annotation.Nullable;
-import java.util.List;
-
-/**
- * Immutable input bundle for {@link BannerModSettlementGrowthManager}. Holds
- * just the seeds and signals needed to score growth candidates. Use
- * {@link #fromSnapshot} for the common case; the canonical record constructor
- * is left accessible for tests that want a minimal input.
- */
-public record BannerModSettlementGrowthContext(
- BannerModSettlementProjectCandidateSeed projectCandidateSeed,
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed,
- BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed,
- BannerModSettlementSupplySignalState supplySignalState,
- List<BannerModSettlementBuildingRecord> buildings,
- List<BannerModSettlementResidentRecord> residents,
- int residentCapacity,
- int assignedResidentCount,
- int unassignedWorkerCount,
- int missingWorkAreaAssignmentCount,
- @Nullable BannerModGovernorSnapshot governorSnapshot,
- long gameTime
-) {
- public BannerModSettlementGrowthContext {
- projectCandidateSeed = projectCandidateSeed == null
- ? BannerModSettlementProjectCandidateSeed.empty() : projectCandidateSeed;
- desiredGoodsSeed = desiredGoodsSeed == null
- ? BannerModSettlementDesiredGoodsSeed.empty() : desiredGoodsSeed;
- stockpileSummary = stockpileSummary == null
- ? BannerModSettlementStockpileSummary.empty() : stockpileSummary;
- marketState = marketState == null
- ? BannerModSettlementMarketState.empty() : marketState;
- tradeRouteHandoffSeed = tradeRouteHandoffSeed == null
- ? BannerModSettlementTradeRouteHandoffSeed.empty() : tradeRouteHandoffSeed;
- supplySignalState = supplySignalState == null
- ? BannerModSettlementSupplySignalState.empty() : supplySignalState;
- buildings = List.copyOf(buildings == null ? List.of() : buildings);
- residents = List.copyOf(residents == null ? List.of() : residents);
- residentCapacity = Math.max(0, residentCapacity);
- assignedResidentCount = Math.max(0, assignedResidentCount);
- unassignedWorkerCount = Math.max(0, unassignedWorkerCount);
- missingWorkAreaAssignmentCount = Math.max(0, missingWorkAreaAssignmentCount);
- }
-
- public static BannerModSettlementGrowthContext fromSnapshot(
- BannerModSettlementSnapshot snapshot,
- long gameTime
- ) {
- return fromSnapshot(snapshot, null, gameTime);
- }
-
- public static BannerModSettlementGrowthContext fromSnapshot(
- BannerModSettlementSnapshot snapshot,
- @Nullable BannerModGovernorSnapshot governorSnapshot,
- long gameTime
- ) {
- if (snapshot == null) {
- throw new IllegalArgumentException("snapshot must not be null");
- }
- return new BannerModSettlementGrowthContext(
- snapshot.projectCandidateSeed(),
- snapshot.desiredGoodsSeed(),
- snapshot.stockpileSummary(),
- snapshot.marketState(),
- snapshot.tradeRouteHandoffSeed(),
- snapshot.supplySignalState(),
- snapshot.buildings(),
- snapshot.residents(),
- snapshot.residentCapacity(),
- snapshot.assignedResidentCount(),
- snapshot.unassignedWorkerCount(),
- snapshot.missingWorkAreaAssignmentCount(),
- governorSnapshot,
- gameTime
- );
- }
-
- /** True when the governor rollup carries the {@code under_siege} incident. */
- public boolean isUnderSiege() {
- if (this.governorSnapshot == null) {
- return false;
- }
- for (String token : this.governorSnapshot.incidentTokens()) {
- if ("under_siege".equalsIgnoreCase(token)) {
- return true;
- }
- }
- return false;
- }
-
- /** Resident capacity not yet filled; non-negative. */
- public int housingHeadroom() {
- return Math.max(0, this.residentCapacity - this.assignedResidentCount);
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/growth/PendingProject.java b/src/main/java/com/talhanation/bannermod/settlement/growth/PendingProject.java
index ada4fcca..1d1582a5 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/growth/PendingProject.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/growth/PendingProject.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.growth;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
import net.minecraft.nbt.CompoundTag;
import javax.annotation.Nullable;
@@ -16,8 +16,8 @@ public record PendingProject(
UUID projectId,
ProjectKind kind,
@Nullable UUID targetBuildingUuid,
- BannerModSettlementBuildingCategory buildingCategory,
- BannerModSettlementBuildingProfileSeed profileSeed,
+ SettlementBuildingCategory buildingCategory,
+ SettlementBuildingProfileSeed profileSeed,
int priorityScore,
long proposedAtGameTime,
int estimatedTickCost,
@@ -31,7 +31,7 @@ public record PendingProject(
throw new IllegalArgumentException("kind must not be null");
}
if (profileSeed == null) {
- profileSeed = BannerModSettlementBuildingProfileSeed.GENERAL;
+ profileSeed = SettlementBuildingProfileSeed.GENERAL;
}
if (buildingCategory == null) {
buildingCategory = profileSeed.category();
@@ -68,8 +68,8 @@ public static PendingProject fromTag(CompoundTag tag) {
tag.getUUID("Id"),
kindFromTagName(tag.getString("Kind")),
target,
- BannerModSettlementBuildingCategory.fromTagName(tag.getString("Category")),
- BannerModSettlementBuildingProfileSeed.fromTagName(tag.getString("Profile")),
+ SettlementBuildingCategory.fromTagName(tag.getString("Category")),
+ SettlementBuildingProfileSeed.fromTagName(tag.getString("Profile")),
tag.getInt("Priority"),
tag.getLong("ProposedAt"),
tag.getInt("Cost"),
diff --git a/src/main/java/com/talhanation/bannermod/settlement/growth/SettlementGrowthContext.java b/src/main/java/com/talhanation/bannermod/settlement/growth/SettlementGrowthContext.java
new file mode 100644
index 00000000..8fb65f17
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/growth/SettlementGrowthContext.java
@@ -0,0 +1,110 @@
+package com.talhanation.bannermod.settlement.growth;
+
+import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodsSnapshot;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementStockpileSummary;
+import com.talhanation.bannermod.settlement.SettlementSupplySignalState;
+import com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+/**
+ * Immutable input bundle for {@link SettlementGrowthManager}. Holds
+ * just the snapshots and signals needed to score growth candidates. Use
+ * {@link #fromSnapshot} for the common case; the canonical record constructor
+ * is left accessible for tests that want a minimal input.
+ */
+public record SettlementGrowthContext(
+ SettlementProjectCandidateSnapshot projectCandidateSnapshot,
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot,
+ SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot,
+ SettlementSupplySignalState supplySignalState,
+ List<SettlementBuildingRecord> buildings,
+ List<SettlementResidentRecord> residents,
+ int residentCapacity,
+ int assignedResidentCount,
+ int unassignedWorkerCount,
+ int missingWorkAreaAssignmentCount,
+ @Nullable BannerModGovernorSnapshot governorSnapshot,
+ long gameTime
+) {
+ public SettlementGrowthContext {
+ projectCandidateSnapshot = projectCandidateSnapshot == null
+ ? SettlementProjectCandidateSnapshot.empty() : projectCandidateSnapshot;
+ desiredGoodsSnapshot = desiredGoodsSnapshot == null
+ ? SettlementDesiredGoodsSnapshot.empty() : desiredGoodsSnapshot;
+ stockpileSummary = stockpileSummary == null
+ ? SettlementStockpileSummary.empty() : stockpileSummary;
+ marketState = marketState == null
+ ? SettlementMarketState.empty() : marketState;
+ tradeRouteHandoffSnapshot = tradeRouteHandoffSnapshot == null
+ ? SettlementTradeRouteHandoffSnapshot.empty() : tradeRouteHandoffSnapshot;
+ supplySignalState = supplySignalState == null
+ ? SettlementSupplySignalState.empty() : supplySignalState;
+ buildings = List.copyOf(buildings == null ? List.of() : buildings);
+ residents = List.copyOf(residents == null ? List.of() : residents);
+ residentCapacity = Math.max(0, residentCapacity);
+ assignedResidentCount = Math.max(0, assignedResidentCount);
+ unassignedWorkerCount = Math.max(0, unassignedWorkerCount);
+ missingWorkAreaAssignmentCount = Math.max(0, missingWorkAreaAssignmentCount);
+ }
+
+ public static SettlementGrowthContext fromSnapshot(
+ SettlementSnapshot snapshot,
+ long gameTime
+ ) {
+ return fromSnapshot(snapshot, null, gameTime);
+ }
+
+ public static SettlementGrowthContext fromSnapshot(
+ SettlementSnapshot snapshot,
+ @Nullable BannerModGovernorSnapshot governorSnapshot,
+ long gameTime
+ ) {
+ if (snapshot == null) {
+ throw new IllegalArgumentException("snapshot must not be null");
+ }
+ return new SettlementGrowthContext(
+ snapshot.projectCandidateSnapshot(),
+ snapshot.desiredGoodsSnapshot(),
+ snapshot.stockpileSummary(),
+ snapshot.marketState(),
+ snapshot.tradeRouteHandoffSnapshot(),
+ snapshot.supplySignalState(),
+ snapshot.buildings(),
+ snapshot.residents(),
+ snapshot.residentCapacity(),
+ snapshot.assignedResidentCount(),
+ snapshot.unassignedWorkerCount(),
+ snapshot.missingWorkAreaAssignmentCount(),
+ governorSnapshot,
+ gameTime
+ );
+ }
+
+ /** True when the governor rollup carries the {@code under_siege} incident. */
+ public boolean isUnderSiege() {
+ if (this.governorSnapshot == null) {
+ return false;
+ }
+ for (String token : this.governorSnapshot.incidentTokens()) {
+ if ("under_siege".equalsIgnoreCase(token)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /** Resident capacity not yet filled; non-negative. */
+ public int housingHeadroom() {
+ return Math.max(0, this.residentCapacity - this.assignedResidentCount);
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManager.java b/src/main/java/com/talhanation/bannermod/settlement/growth/SettlementGrowthManager.java
similarity index 67%
rename from src/main/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManager.java
rename to src/main/java/com/talhanation/bannermod/settlement/growth/SettlementGrowthManager.java
index 29abff6e..9fa076de 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManager.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/growth/SettlementGrowthManager.java
@@ -1,11 +1,11 @@
package com.talhanation.bannermod.settlement.growth;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignal;
-import com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodSnapshot;
+import com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSupplySignal;
+import com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot;
import java.util.ArrayList;
import java.util.Comparator;
@@ -22,7 +22,7 @@
* Scoring is deterministic. Contract is patterned on Millenaire's
* {@code VillageGrowthManager}; implementation is hand-rolled.
*/
-public final class BannerModSettlementGrowthManager {
+public final class SettlementGrowthManager {
private static final int SEED_CANDIDATE_BASE_SCORE = 300;
private static final int SEED_CANDIDATE_PRIORITY_BONUS_PER_UNIT = 25;
@@ -40,18 +40,18 @@ public final class BannerModSettlementGrowthManager {
private static final int GOVERNOR_POLICY_WEIGHT = 5;
private static final int DEFAULT_ESTIMATED_TICK_COST = 20 * 60;
- private BannerModSettlementGrowthManager() {}
+ private SettlementGrowthManager() {}
/** Ordered list of projects, highest priority first; empty when nothing to do. */
public static List<PendingProject> evaluateGrowthQueue(
- BannerModSettlementGrowthContext ctx,
+ SettlementGrowthContext ctx,
int maxQueueSize
) {
if (ctx == null || maxQueueSize <= 0) {
return List.of();
}
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile =
- new EnumMap<>(BannerModSettlementBuildingProfileSeed.class);
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile =
+ new EnumMap<>(SettlementBuildingProfileSeed.class);
scoreSeedCandidate(ctx, byProfile);
scoreHousingPressure(ctx, byProfile);
scoreMissingMarket(ctx, byProfile);
@@ -75,27 +75,27 @@ public static List<PendingProject> evaluateGrowthQueue(
}
/** Convenience wrapper returning only the top-scored project. */
- public static Optional<PendingProject> pickNextProject(BannerModSettlementGrowthContext ctx) {
+ public static Optional<PendingProject> pickNextProject(SettlementGrowthContext ctx) {
List<PendingProject> queue = evaluateGrowthQueue(ctx, 1);
return queue.isEmpty() ? Optional.empty() : Optional.of(queue.get(0));
}
private static void scoreSeedCandidate(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
- BannerModSettlementProjectCandidateSeed seed = ctx.projectCandidateSeed();
+ SettlementProjectCandidateSnapshot seed = ctx.projectCandidateSnapshot();
if (seed == null || seed.targetBuildingProfileSeed() == null) {
return;
}
- BannerModSettlementBuildingProfileSeed profile = seed.targetBuildingProfileSeed();
+ SettlementBuildingProfileSeed profile = seed.targetBuildingProfileSeed();
int score = SEED_CANDIDATE_BASE_SCORE + SEED_CANDIDATE_PRIORITY_BONUS_PER_UNIT * seed.priority();
mergeOrInsert(byProfile, profile, score);
}
private static void scoreHousingPressure(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
int capacity = ctx.residentCapacity();
int assigned = ctx.assignedResidentCount();
@@ -108,12 +108,12 @@ private static void scoreHousingPressure(
int bonusUnits = Math.max(unassignedWorkers, Math.max(0, assigned - capacity));
int score = HOUSING_SHORTAGE_BASE_SCORE + HOUSING_SHORTAGE_PER_UNASSIGNED_BONUS * bonusUnits;
// Housing falls under GENERAL; no dedicated HOUSING category yet.
- mergeOrInsert(byProfile, BannerModSettlementBuildingProfileSeed.GENERAL, score);
+ mergeOrInsert(byProfile, SettlementBuildingProfileSeed.GENERAL, score);
}
private static void scoreMissingMarket(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
if (ctx.marketState() == null) {
return;
@@ -131,53 +131,53 @@ private static void scoreMissingMarket(
if (!hasActivity) {
return;
}
- mergeOrInsert(byProfile, BannerModSettlementBuildingProfileSeed.MARKET, MARKET_MISSING_BASE_SCORE);
+ mergeOrInsert(byProfile, SettlementBuildingProfileSeed.MARKET, MARKET_MISSING_BASE_SCORE);
}
private static void scoreDesiredGoods(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
Map<String, Integer> demandByGood = hintedDemandByGood(ctx);
if (demandByGood.isEmpty()) {
return;
}
for (Map.Entry<String, Integer> entry : demandByGood.entrySet()) {
- BannerModSettlementBuildingProfileSeed profile = profileForDesiredGood(entry.getKey());
+ SettlementBuildingProfileSeed profile = profileForDesiredGood(entry.getKey());
if (profile == null) {
continue;
}
int score = DESIRED_GOOD_BASE_SCORE + DESIRED_GOOD_PER_DRIVER_BONUS * entry.getValue()
- + tradeRouteDemandBonus(profile, ctx.tradeRouteHandoffSeed());
+ + tradeRouteDemandBonus(profile, ctx.tradeRouteHandoffSnapshot());
mergeOrInsert(byProfile, profile, score);
}
}
- private static Map<String, Integer> hintedDemandByGood(BannerModSettlementGrowthContext ctx) {
+ private static Map<String, Integer> hintedDemandByGood(SettlementGrowthContext ctx) {
Map<String, Integer> demandByGood = new LinkedHashMap<>();
- for (BannerModSettlementDesiredGoodSeed good : ctx.desiredGoodsSeed().desiredGoods()) {
+ for (SettlementDesiredGoodSnapshot good : ctx.desiredGoodsSnapshot().desiredGoods()) {
mergeDemand(demandByGood, good.desiredGoodId(), good.driverCount());
}
- for (BannerModSettlementDesiredGoodSeed good : ctx.tradeRouteHandoffSeed().desiredGoods()) {
+ for (SettlementDesiredGoodSnapshot good : ctx.tradeRouteHandoffSnapshot().desiredGoods()) {
mergeDemand(demandByGood, good.desiredGoodId(), good.driverCount());
}
- for (BannerModSettlementSupplySignal signal : ctx.supplySignalState().signals()) {
+ for (SettlementSupplySignal signal : ctx.supplySignalState().signals()) {
mergeDemand(demandByGood, signal.goodId(), signal.desiredUnits());
}
return demandByGood;
}
private static void scoreSpecificSupplySignals(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
- for (BannerModSettlementSupplySignal signal : ctx.supplySignalState().signals()) {
+ for (SettlementSupplySignal signal : ctx.supplySignalState().signals()) {
int shortageUnits = signal.shortageUnits();
int reservationUnits = signal.reservationHintUnits();
if (shortageUnits <= 0 && reservationUnits <= 0) {
continue;
}
- BannerModSettlementBuildingProfileSeed profile = profileForDesiredGood(signal.goodId());
+ SettlementBuildingProfileSeed profile = profileForDesiredGood(signal.goodId());
if (profile == null) {
continue;
}
@@ -188,7 +188,7 @@ private static void scoreSpecificSupplySignals(
if (reservationUnits > 0) {
score = Math.max(score, SUPPLY_RESERVATION_BASE_SCORE + SUPPLY_RESERVATION_PER_UNIT_BONUS * reservationUnits);
}
- mergeOrInsert(byProfile, profile, score + tradeRouteDemandBonus(profile, ctx.tradeRouteHandoffSeed()));
+ mergeOrInsert(byProfile, profile, score + tradeRouteDemandBonus(profile, ctx.tradeRouteHandoffSnapshot()));
}
}
@@ -199,24 +199,24 @@ private static void mergeDemand(Map<String, Integer> demandByGood, String goodId
demandByGood.merge(goodId, units, Math::max);
}
- private static int tradeRouteDemandBonus(BannerModSettlementBuildingProfileSeed profile,
- BannerModSettlementTradeRouteHandoffSeed handoffSeed) {
- if (handoffSeed == null) {
+ private static int tradeRouteDemandBonus(SettlementBuildingProfileSeed profile,
+ SettlementTradeRouteHandoffSnapshot handoffSnapshot) {
+ if (handoffSnapshot == null) {
return 0;
}
return switch (profile) {
case STORAGE -> DESIRED_GOOD_PER_DRIVER_BONUS
- * Math.max(handoffSeed.activeReservationCount(), handoffSeed.routedStorageCount());
+ * Math.max(handoffSnapshot.activeReservationCount(), handoffSnapshot.routedStorageCount());
case MARKET -> DESIRED_GOOD_PER_DRIVER_BONUS
- * Math.max(handoffSeed.activeReservationCount(),
- handoffSeed.readySellerDispatchCount() + handoffSeed.portEntrypointCount());
+ * Math.max(handoffSnapshot.activeReservationCount(),
+ handoffSnapshot.readySellerDispatchCount() + handoffSnapshot.portEntrypointCount());
default -> 0;
};
}
private static void applyGovernorAdjustments(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
if (ctx.governorSnapshot() == null) {
return;
@@ -226,25 +226,25 @@ private static void applyGovernorAdjustments(
int fortificationBoost = ctx.governorSnapshot().fortificationPriority() * GOVERNOR_POLICY_WEIGHT;
int garrisonBoost = ctx.governorSnapshot().garrisonPriority() * GOVERNOR_POLICY_WEIGHT;
if (fortificationBoost != 0 || garrisonBoost != 0) {
- ScoredCandidate existing = byProfile.get(BannerModSettlementBuildingProfileSeed.CONSTRUCTION);
+ ScoredCandidate existing = byProfile.get(SettlementBuildingProfileSeed.CONSTRUCTION);
int boost = fortificationBoost + garrisonBoost;
if (existing != null) {
existing.score += boost;
} else if (boost > 0) {
- mergeOrInsert(byProfile, BannerModSettlementBuildingProfileSeed.CONSTRUCTION, boost);
+ mergeOrInsert(byProfile, SettlementBuildingProfileSeed.CONSTRUCTION, boost);
}
}
}
private static void applySiegeAdjustments(
- BannerModSettlementGrowthContext ctx,
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile
+ SettlementGrowthContext ctx,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile
) {
if (!ctx.isUnderSiege()) {
return;
}
- for (Map.Entry<BannerModSettlementBuildingProfileSeed, ScoredCandidate> entry : byProfile.entrySet()) {
- if (entry.getKey() == BannerModSettlementBuildingProfileSeed.CONSTRUCTION) {
+ for (Map.Entry<SettlementBuildingProfileSeed, ScoredCandidate> entry : byProfile.entrySet()) {
+ if (entry.getKey() == SettlementBuildingProfileSeed.CONSTRUCTION) {
entry.getValue().score += SIEGE_DEFENSE_BONUS;
entry.getValue().blocker = ProjectBlocker.NONE;
} else {
@@ -253,29 +253,29 @@ private static void applySiegeAdjustments(
}
}
// Ensure a defensive option always exists while under siege.
- byProfile.computeIfAbsent(BannerModSettlementBuildingProfileSeed.CONSTRUCTION,
+ byProfile.computeIfAbsent(SettlementBuildingProfileSeed.CONSTRUCTION,
profile -> new ScoredCandidate(profile, SIEGE_DEFENSE_BONUS, ProjectBlocker.NONE));
}
- private static BannerModSettlementBuildingProfileSeed profileForDesiredGood(String desiredGoodId) {
+ private static SettlementBuildingProfileSeed profileForDesiredGood(String desiredGoodId) {
if (desiredGoodId == null || desiredGoodId.isBlank()) {
return null;
}
if (desiredGoodId.startsWith("storage_type:")) {
- return BannerModSettlementBuildingProfileSeed.STORAGE;
+ return SettlementBuildingProfileSeed.STORAGE;
}
return switch (desiredGoodId) {
- case "food" -> BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION;
- case "materials" -> BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION;
- case "construction_materials" -> BannerModSettlementBuildingProfileSeed.CONSTRUCTION;
- case "market_goods", "trade_stock" -> BannerModSettlementBuildingProfileSeed.MARKET;
+ case "food" -> SettlementBuildingProfileSeed.FOOD_PRODUCTION;
+ case "materials" -> SettlementBuildingProfileSeed.MATERIAL_PRODUCTION;
+ case "construction_materials" -> SettlementBuildingProfileSeed.CONSTRUCTION;
+ case "market_goods", "trade_stock" -> SettlementBuildingProfileSeed.MARKET;
default -> null;
};
}
private static void mergeOrInsert(
- Map<BannerModSettlementBuildingProfileSeed, ScoredCandidate> byProfile,
- BannerModSettlementBuildingProfileSeed profile,
+ Map<SettlementBuildingProfileSeed, ScoredCandidate> byProfile,
+ SettlementBuildingProfileSeed profile,
int score
) {
ScoredCandidate existing = byProfile.get(profile);
@@ -295,11 +295,11 @@ private static void mergeOrInsert(
};
private static final class ScoredCandidate {
- final BannerModSettlementBuildingProfileSeed profile;
+ final SettlementBuildingProfileSeed profile;
int score;
ProjectBlocker blocker;
- ScoredCandidate(BannerModSettlementBuildingProfileSeed profile, int score, ProjectBlocker blocker) {
+ ScoredCandidate(SettlementBuildingProfileSeed profile, int score, ProjectBlocker blocker) {
this.profile = profile;
this.score = score;
this.blocker = blocker;
@@ -309,12 +309,12 @@ int clampedScore() {
return Math.max(0, Math.min(1000, this.score));
}
- PendingProject toPendingProject(BannerModSettlementGrowthContext ctx) {
- BannerModSettlementBuildingCategory category = this.profile.category();
+ PendingProject toPendingProject(SettlementGrowthContext ctx) {
+ SettlementBuildingCategory category = this.profile.category();
UUID projectId = deterministicProjectId(ctx, this.profile);
ProjectBlocker effectiveBlocker = this.blocker;
if (effectiveBlocker == ProjectBlocker.NONE && ctx.isUnderSiege()
- && this.profile != BannerModSettlementBuildingProfileSeed.CONSTRUCTION) {
+ && this.profile != SettlementBuildingProfileSeed.CONSTRUCTION) {
effectiveBlocker = ProjectBlocker.UNDER_SIEGE;
}
return new PendingProject(
@@ -332,8 +332,8 @@ PendingProject toPendingProject(BannerModSettlementGrowthContext ctx) {
}
private static UUID deterministicProjectId(
- BannerModSettlementGrowthContext ctx,
- BannerModSettlementBuildingProfileSeed profile
+ SettlementGrowthContext ctx,
+ SettlementBuildingProfileSeed profile
) {
long hi = mix64(profile.ordinal() + 1L, profile.category().ordinal() + 1L);
long lo = mix64(profile.hashCode(), ctx.buildings().size() + 1L);
diff --git a/src/main/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisor.java b/src/main/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisor.java
index 193a103c..72136328 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisor.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisor.java
@@ -1,8 +1,8 @@
package com.talhanation.bannermod.settlement.household;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import java.util.List;
import java.util.Optional;
@@ -15,7 +15,7 @@
*
* <p>The advisor treats "housing-ish" buildings as candidates. The settlement
* building category enum does not yet expose a dedicated HOUSING slot, so we
- * fall back to {@link BannerModSettlementBuildingCategory#GENERAL} and prefer
+ * fall back to {@link SettlementBuildingCategory#GENERAL} and prefer
* those entries. TODO: once HOUSING is introduced, swap the preference list.
*/
public final class BannerModHomeAssignmentAdvisor {
@@ -25,8 +25,8 @@ public final class BannerModHomeAssignmentAdvisor {
* HOUSING value in a later slice, add it above GENERAL.
* TODO category — replace GENERAL with HOUSING when the enum gains that value.
*/
- private static final BannerModSettlementBuildingCategory HOUSING_CATEGORY =
- BannerModSettlementBuildingCategory.GENERAL;
+ private static final SettlementBuildingCategory HOUSING_CATEGORY =
+ SettlementBuildingCategory.GENERAL;
private BannerModHomeAssignmentAdvisor() {
// static helper
@@ -50,12 +50,12 @@ private BannerModHomeAssignmentAdvisor() {
* </ul>
*/
public static Optional<UUID> pickHomeBuilding(UUID residentUuid,
- BannerModSettlementSnapshot snapshot,
+ SettlementSnapshot snapshot,
BannerModHomeAssignmentRuntime existing) {
if (residentUuid == null || snapshot == null || existing == null) {
return Optional.empty();
}
- List<BannerModSettlementBuildingRecord> buildings = snapshot.buildings();
+ List<SettlementBuildingRecord> buildings = snapshot.buildings();
if (buildings == null || buildings.isEmpty()) {
return Optional.empty();
}
@@ -68,14 +68,14 @@ public static Optional<UUID> pickHomeBuilding(UUID residentUuid,
}
private static Optional<UUID> scan(UUID residentUuid,
- List<BannerModSettlementBuildingRecord> buildings,
+ List<SettlementBuildingRecord> buildings,
BannerModHomeAssignmentRuntime existing,
- BannerModSettlementBuildingCategory required,
+ SettlementBuildingCategory required,
boolean enforceCategory) {
UUID currentHome = existing.homeFor(residentUuid)
.map(HomeAssignment::homeBuildingUuid)
.orElse(null);
- for (BannerModSettlementBuildingRecord building : buildings) {
+ for (SettlementBuildingRecord building : buildings) {
if (building == null || building.buildingUuid() == null) {
continue;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/household/GoHomeResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/household/GoHomeResidentGoal.java
index 3ef7aae0..64d2a16f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/household/GoHomeResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/household/GoHomeResidentGoal.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.household;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleWindowSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleWindowSeed;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -73,7 +73,7 @@ private static boolean isRestOrApproachingRest(ResidentGoalContext ctx) {
if (ctx.isRestPhase()) {
return true;
}
- BannerModSettlementResidentScheduleWindowSeed window = ctx.window();
+ SettlementResidentScheduleWindowSeed window = ctx.window();
int now = ctx.dayTime();
int restStart = window.restStartTick();
int approachStart = restStart - APPROACH_WINDOW_TICKS;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/household/LeaveHomeResidentGoal.java b/src/main/java/com/talhanation/bannermod/settlement/household/LeaveHomeResidentGoal.java
index 1f5307ad..3f8e3f84 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/household/LeaveHomeResidentGoal.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/household/LeaveHomeResidentGoal.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.household;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleWindowSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleWindowSeed;
import com.talhanation.bannermod.settlement.goal.ResidentGoal;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import com.talhanation.bannermod.settlement.goal.ResidentTask;
@@ -74,7 +74,7 @@ private static boolean isEarlyActive(ResidentGoalContext ctx) {
if (!ctx.isActivePhase()) {
return false;
}
- BannerModSettlementResidentScheduleWindowSeed window = ctx.window();
+ SettlementResidentScheduleWindowSeed window = ctx.window();
int now = ctx.dayTime();
int activeStart = window.activeStartTick();
int cutoff = activeStart + EARLY_ACTIVE_WINDOW_TICKS;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/job/BuildJobHandler.java b/src/main/java/com/talhanation/bannermod/settlement/job/BuildJobHandler.java
index be6b8695..5f66ab82 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/job/BuildJobHandler.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/job/BuildJobHandler.java
@@ -1,8 +1,8 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementJobHandlerSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentMode;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementJobHandlerSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentMode;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderType;
@@ -14,10 +14,10 @@
import java.util.UUID;
/**
- * Construction-style work handler bound to {@link BannerModSettlementJobHandlerSeed#LOCAL_BUILDING_LABOR}.
+ * Building-bound work handler bound to {@link SettlementJobHandlerSeed#LOCAL_BUILDING_LABOR}.
*
- * <p>Claim lifecycle mirrors {@link HarvestJobHandler} but the set of accepted order types
- * is restricted to building-oriented work (break / place blocks).</p>
+ * <p>Claim lifecycle mirrors {@link HarvestJobHandler} but scopes accepted order types to work
+ * emitted by the resident's assigned local building.</p>
*/
public final class BuildJobHandler implements JobHandler {
@@ -25,7 +25,10 @@ public final class BuildJobHandler implements JobHandler {
public static final Set<SettlementWorkOrderType> SUPPORTED_TYPES = EnumSet.of(
SettlementWorkOrderType.BREAK_BLOCK,
- SettlementWorkOrderType.BUILD_BLOCK
+ SettlementWorkOrderType.BUILD_BLOCK,
+ SettlementWorkOrderType.ANIMAL_BREED,
+ SettlementWorkOrderType.ANIMAL_SPECIAL_TASK,
+ SettlementWorkOrderType.ANIMAL_SLAUGHTER
);
@Override
@@ -34,8 +37,8 @@ public ResourceLocation id() {
}
@Override
- public BannerModSettlementJobHandlerSeed handles() {
- return BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR;
+ public SettlementJobHandlerSeed handles() {
+ return SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR;
}
@Override
@@ -43,12 +46,12 @@ public boolean canHandle(JobExecutionContext ctx) {
if (ctx == null || ctx.resident() == null) {
return false;
}
- return ctx.resident().residentMode() == BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER;
+ return ctx.resident().residentMode() == SettlementResidentMode.PROJECTED_CONTROLLED_WORKER;
}
@Override
public JobExecutionResult runOneStep(JobExecutionContext ctx) {
- BannerModSettlementResidentRecord resident = ctx.resident();
+ SettlementResidentRecord resident = ctx.resident();
SettlementWorkOrderRuntime runtime = ctx.workOrderRuntime();
if (runtime == null || resident.residentUuid() == null) {
return JobExecutionResult.COMPLETED;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/job/HarvestJobHandler.java b/src/main/java/com/talhanation/bannermod/settlement/job/HarvestJobHandler.java
index f0865146..8238a30f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/job/HarvestJobHandler.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/job/HarvestJobHandler.java
@@ -1,8 +1,8 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementJobHandlerSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentMode;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementJobHandlerSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentMode;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderType;
@@ -14,7 +14,7 @@
import java.util.UUID;
/**
- * Floating-labor work handler bound to {@link BannerModSettlementJobHandlerSeed#FLOATING_LABOR_POOL}.
+ * Floating-labor work handler bound to {@link SettlementJobHandlerSeed#FLOATING_LABOR_POOL}.
*
* <p>On each step the handler:</p>
* <ol>
@@ -59,8 +59,8 @@ public ResourceLocation id() {
}
@Override
- public BannerModSettlementJobHandlerSeed handles() {
- return BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL;
+ public SettlementJobHandlerSeed handles() {
+ return SettlementJobHandlerSeed.FLOATING_LABOR_POOL;
}
@Override
@@ -68,12 +68,12 @@ public boolean canHandle(JobExecutionContext ctx) {
if (ctx == null || ctx.resident() == null) {
return false;
}
- return ctx.resident().residentMode() == BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER;
+ return ctx.resident().residentMode() == SettlementResidentMode.PROJECTED_CONTROLLED_WORKER;
}
@Override
public JobExecutionResult runOneStep(JobExecutionContext ctx) {
- BannerModSettlementResidentRecord resident = ctx.resident();
+ SettlementResidentRecord resident = ctx.resident();
SettlementWorkOrderRuntime runtime = ctx.workOrderRuntime();
if (runtime == null || resident.residentUuid() == null) {
return JobExecutionResult.COMPLETED;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/job/JobExecutionContext.java b/src/main/java/com/talhanation/bannermod/settlement/job/JobExecutionContext.java
index 21cd775d..029bd11f 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/job/JobExecutionContext.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/job/JobExecutionContext.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import javax.annotation.Nullable;
@@ -20,7 +20,7 @@
* entries. It may be {@code null} under test conditions.</p>
*/
public record JobExecutionContext(
- BannerModSettlementResidentRecord resident,
+ SettlementResidentRecord resident,
long gameTime,
@Nullable UUID boundEntityUuid,
@Nullable UUID workplaceUuid,
@@ -31,7 +31,7 @@ public record JobExecutionContext(
}
/** Backward-compatible constructor for tests that do not exercise the work-order layer. */
- public JobExecutionContext(BannerModSettlementResidentRecord resident,
+ public JobExecutionContext(SettlementResidentRecord resident,
long gameTime,
@Nullable UUID boundEntityUuid,
@Nullable UUID workplaceUuid) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/job/JobHandler.java b/src/main/java/com/talhanation/bannermod/settlement/job/JobHandler.java
index d9197c35..5438da74 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/job/JobHandler.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/job/JobHandler.java
@@ -1,11 +1,11 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementJobHandlerSeed;
+import com.talhanation.bannermod.settlement.SettlementJobHandlerSeed;
import net.minecraft.resources.ResourceLocation;
/**
* Executable side of a job task. Implementations are registered by
- * {@link JobHandlerRegistry} and selected via a {@link BannerModSettlementJobHandlerSeed}.
+ * {@link JobHandlerRegistry} and selected via a {@link SettlementJobHandlerSeed}.
*
* <p>Handlers are stateless singletons with respect to a given registry; per-resident state
* lives on the resident record or later on scheduler data, not on the handler instance.</p>
@@ -15,7 +15,7 @@ public interface JobHandler {
ResourceLocation id();
/** Seed enum value this handler claims ownership of. */
- BannerModSettlementJobHandlerSeed handles();
+ SettlementJobHandlerSeed handles();
/** Fast precondition check used by the scheduler before calling {@link #runOneStep}. */
boolean canHandle(JobExecutionContext ctx);
diff --git a/src/main/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistry.java b/src/main/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistry.java
index bbc9503c..3a5a128e 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistry.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistry.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementJobHandlerSeed;
+import com.talhanation.bannermod.settlement.SettlementJobHandlerSeed;
import net.minecraft.resources.ResourceLocation;
import java.util.Collections;
@@ -13,14 +13,14 @@
/**
* In-memory catalogue of {@link JobHandler}s, keyed by both
- * {@link BannerModSettlementJobHandlerSeed} and {@link ResourceLocation} id.
+ * {@link SettlementJobHandlerSeed} and {@link ResourceLocation} id.
*
* <p>Semantics:</p>
* <ul>
* <li>The registry is not thread-safe. Callers (typically the server tick loop or bootstrap
* code) are expected to register handlers at construction time and then treat the
* registry as read-mostly.</li>
- * <li>Registering a second handler for the same {@link BannerModSettlementJobHandlerSeed}
+ * <li>Registering a second handler for the same {@link SettlementJobHandlerSeed}
* replaces the previous seed binding (<em>last registration wins</em>). Both handlers
* remain reachable by their unique {@link ResourceLocation} id, so the older handler is
* not evicted from the id lookup unless its id is re-used.</li>
@@ -30,8 +30,8 @@
public final class JobHandlerRegistry {
private final Map<ResourceLocation, JobHandler> byId = new LinkedHashMap<>();
- private final Map<BannerModSettlementJobHandlerSeed, JobHandler> bySeed =
- new EnumMap<>(BannerModSettlementJobHandlerSeed.class);
+ private final Map<SettlementJobHandlerSeed, JobHandler> bySeed =
+ new EnumMap<>(SettlementJobHandlerSeed.class);
/** Build a registry pre-populated with the built-in handlers declared by this slice. */
public static JobHandlerRegistry defaults() {
@@ -44,12 +44,12 @@ public static JobHandlerRegistry defaults() {
public void register(JobHandler handler) {
Objects.requireNonNull(handler, "handler");
ResourceLocation id = Objects.requireNonNull(handler.id(), "handler.id()");
- BannerModSettlementJobHandlerSeed seed = Objects.requireNonNull(handler.handles(), "handler.handles()");
+ SettlementJobHandlerSeed seed = Objects.requireNonNull(handler.handles(), "handler.handles()");
byId.put(id, handler);
bySeed.put(seed, handler);
}
- public Optional<JobHandler> lookup(BannerModSettlementJobHandlerSeed seed) {
+ public Optional<JobHandler> lookup(SettlementJobHandlerSeed seed) {
if (seed == null) {
return Optional.empty();
}
@@ -78,7 +78,7 @@ public int size() {
}
/** Read-only view of the seed-to-handler bindings, primarily for diagnostics. */
- public Map<BannerModSettlementJobHandlerSeed, JobHandler> seedBindings() {
+ public Map<SettlementJobHandlerSeed, JobHandler> seedBindings() {
return Collections.unmodifiableMap(bySeed);
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/job/JobTaskDefinition.java b/src/main/java/com/talhanation/bannermod/settlement/job/JobTaskDefinition.java
index 102f6762..7b7c44ad 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/job/JobTaskDefinition.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/job/JobTaskDefinition.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementJobHandlerSeed;
+import com.talhanation.bannermod.settlement.SettlementJobHandlerSeed;
import net.minecraft.resources.ResourceLocation;
import java.util.Objects;
@@ -15,7 +15,7 @@
*/
public record JobTaskDefinition(
ResourceLocation id,
- BannerModSettlementJobHandlerSeed handlerSeed,
+ SettlementJobHandlerSeed handlerSeed,
int estimatedTickCost,
int maxConcurrentAssignments,
boolean requiresWorkplace,
diff --git a/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/BuildingValidatorRegistry.java b/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/BuildingValidatorRegistry.java
index 6768a1ae..e0dbcf32 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/BuildingValidatorRegistry.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/BuildingValidatorRegistry.java
@@ -12,14 +12,14 @@
/**
* Central registry mapping prefab id → {@link BuildingValidator}. If no specific validator
- * is registered for a prefab, {@link DefaultBuildingValidator} is used as a fallback so the
+ * is registered for a prefab, {@link PrefabFallbackValidator} is used as a fallback so the
* player always gets a reasonable result.
*/
public final class BuildingValidatorRegistry {
private static final BuildingValidatorRegistry INSTANCE = new BuildingValidatorRegistry();
private final Map<ResourceLocation, BuildingValidator> validators = new LinkedHashMap<>();
- private final BuildingValidator fallback = new DefaultBuildingValidator();
+ private final BuildingValidator fallback = new PrefabFallbackValidator();
private boolean defaultsLoaded;
private BuildingValidatorRegistry() {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/DefaultBuildingValidator.java b/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/PrefabFallbackValidator.java
similarity index 95%
rename from src/main/java/com/talhanation/bannermod/settlement/prefab/validation/DefaultBuildingValidator.java
rename to src/main/java/com/talhanation/bannermod/settlement/prefab/validation/PrefabFallbackValidator.java
index a604246a..3d75b491 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/DefaultBuildingValidator.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/prefab/validation/PrefabFallbackValidator.java
@@ -13,7 +13,7 @@
* minimum footprint and minimum solid-block count, so player-built warehouses still get
* an honest pass/fail even if nobody has written a dedicated ruleset yet.
*/
-public final class DefaultBuildingValidator implements BuildingValidator {
+public final class PrefabFallbackValidator implements BuildingValidator {
public static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath("bannermod", "default");
@Override
diff --git a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridge.java b/src/main/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridge.java
index ad6208d3..6b1ad87d 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridge.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridge.java
@@ -15,7 +15,7 @@
import java.util.UUID;
/**
- * Bridge between a {@link BannerModSettlementProjectScheduler} queue and the existing
+ * Bridge between a {@link SettlementProjectScheduler} queue and the existing
* player-authored BuildArea subsystem.
*
* <p>The bridge is deliberately read-only with respect to {@link BuildArea}: it selects
@@ -132,7 +132,7 @@ public Optional<BuildAreaBinding> resolveCandidate(UUID claimUuid, PendingProjec
* {@link Optional#empty()} is returned so the caller can retry next tick.
*/
public Optional<ProjectAssignment> attemptAssignment(
- BannerModSettlementProjectScheduler scheduler,
+ SettlementProjectScheduler scheduler,
UUID claimUuid,
long gameTime,
BuildAreaResolver resolver
diff --git a/src/main/java/com/talhanation/bannermod/settlement/project/ProjectCancellationReason.java b/src/main/java/com/talhanation/bannermod/settlement/project/ProjectCancellationReason.java
index 00e917c5..c86f16ad 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/project/ProjectCancellationReason.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/project/ProjectCancellationReason.java
@@ -2,7 +2,7 @@
/**
* Reason a {@link com.talhanation.bannermod.settlement.growth.PendingProject} was removed
- * from a {@link BannerModSettlementProjectScheduler} queue. Slice C is concerned only with
+ * from a {@link SettlementProjectScheduler} queue. Slice C is concerned only with
* queue bookkeeping; downstream slices may persist or broadcast these transitions.
*/
public enum ProjectCancellationReason {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntime.java b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectRuntime.java
similarity index 85%
rename from src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntime.java
rename to src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectRuntime.java
index 88e51ce2..1cc40eac 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntime.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectRuntime.java
@@ -15,45 +15,45 @@
import java.util.UUID;
/**
- * Minimal facade that binds one {@link BannerModSettlementProjectScheduler} and
+ * Minimal facade that binds one {@link SettlementProjectScheduler} and
* one {@link BannerModBuildAreaProjectBridge} per {@link ServerLevel}.
*
* <p>Settlement-service code (arriving in slice D) feeds freshly scored
* {@link PendingProject growth queues} in and receives {@link ProjectAssignment}s
- * back. Queue state is persisted through {@link BannerModSettlementProjectSavedData}.
+ * back. Queue state is persisted through {@link SettlementProjectSavedData}.
*/
-public final class BannerModSettlementProjectRuntime {
+public final class SettlementProjectRuntime {
- private final BannerModSettlementProjectScheduler scheduler;
+ private final SettlementProjectScheduler scheduler;
private final BannerModBuildAreaProjectBridge bridge;
private final Map<UUID, ProjectAssignment> assignmentsByBuildArea = new HashMap<>();
- BannerModSettlementProjectRuntime(BannerModSettlementProjectScheduler scheduler,
+ SettlementProjectRuntime(SettlementProjectScheduler scheduler,
BannerModBuildAreaProjectBridge bridge) {
this.scheduler = Objects.requireNonNull(scheduler, "scheduler");
this.bridge = Objects.requireNonNull(bridge, "bridge");
}
/** Lazy per-level singleton for production use. */
- public static synchronized BannerModSettlementProjectRuntime forServer(ServerLevel level) {
+ public static synchronized SettlementProjectRuntime forServer(ServerLevel level) {
Objects.requireNonNull(level, "level");
- return BannerModSettlementProjectSavedData.get(level).runtime();
+ return SettlementProjectSavedData.get(level).runtime();
}
/** Package-private factory for tests and detached callers. */
- static BannerModSettlementProjectRuntime detached() {
- return new BannerModSettlementProjectRuntime(
- BannerModSettlementProjectScheduler.detached(),
+ static SettlementProjectRuntime detached() {
+ return new SettlementProjectRuntime(
+ SettlementProjectScheduler.detached(),
new BannerModBuildAreaProjectBridge()
);
}
/** Public detached factory for cross-package unit tests. */
- public static BannerModSettlementProjectRuntime detachedForTests() {
+ public static SettlementProjectRuntime detachedForTests() {
return detached();
}
- public BannerModSettlementProjectScheduler scheduler() {
+ public SettlementProjectScheduler scheduler() {
return scheduler;
}
@@ -73,7 +73,7 @@ public static BannerModBuildAreaProjectBridge.BuildAreaResolver buildAreaResolve
* to a BuildArea. Returns the resulting {@link ProjectAssignment} when binding succeeds.
*
* <p>Entries already queued under {@code claimUuid} are preserved; duplicate project IDs
- * are ignored. Overflow beyond {@link BannerModSettlementProjectScheduler#PER_CLAIM_QUEUE_CAP}
+ * are ignored. Overflow beyond {@link SettlementProjectScheduler#PER_CLAIM_QUEUE_CAP}
* drops silently.
*/
public Optional<ProjectAssignment> tickClaim(
@@ -101,7 +101,7 @@ public Optional<ProjectAssignment> tickClaim(
&& scheduler.peek(claimUuid)
.filter(project -> project.kind() == ProjectKind.NEW_BUILDING)
.isPresent()
- && BannerModSettlementProjectWorldExecution.ensureExecutableTarget(
+ && SettlementProjectWorldExecution.ensureExecutableTarget(
ignoredLevel,
claimUuid,
scheduler.peek(claimUuid).orElse(null))) {
@@ -120,7 +120,7 @@ public static Optional<ProjectAssignment> tickClaim(ServerLevel level, UUID clai
if (level == null || claimUuid == null) {
return Optional.empty();
}
- BannerModSettlementProjectRuntime runtime = forServer(level);
+ SettlementProjectRuntime runtime = forServer(level);
long gameTime = level.getGameTime();
return runtime.tickClaim(level, claimUuid, growthQueue, buildAreaResolver(level), gameTime);
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSavedData.java b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectSavedData.java
similarity index 53%
rename from src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSavedData.java
rename to src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectSavedData.java
index 08357286..018df548 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSavedData.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectSavedData.java
@@ -7,33 +7,33 @@
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.saveddata.SavedData;
-public class BannerModSettlementProjectSavedData extends SavedData {
+public class SettlementProjectSavedData extends SavedData {
private static final String FILE_ID = "bannermodSettlementProjects";
- private static final SavedData.Factory<BannerModSettlementProjectSavedData> FACTORY = new SavedData.Factory<>(BannerModSettlementProjectSavedData::new, BannerModSettlementProjectSavedData::load);
+ private static final SavedData.Factory<SettlementProjectSavedData> FACTORY = new SavedData.Factory<>(SettlementProjectSavedData::new, SettlementProjectSavedData::load);
private static final int CURRENT_VERSION = 1;
- private final BannerModSettlementProjectRuntime runtime;
+ private final SettlementProjectRuntime runtime;
- public BannerModSettlementProjectSavedData() {
- this(new BannerModSettlementProjectRuntime(
- BannerModSettlementProjectScheduler.detached(),
+ public SettlementProjectSavedData() {
+ this(new SettlementProjectRuntime(
+ SettlementProjectScheduler.detached(),
new BannerModBuildAreaProjectBridge()
));
}
- private BannerModSettlementProjectSavedData(BannerModSettlementProjectRuntime runtime) {
+ private SettlementProjectSavedData(SettlementProjectRuntime runtime) {
this.runtime = runtime;
this.runtime.scheduler().setDirtyListener(this::setDirty);
}
- public static BannerModSettlementProjectSavedData get(ServerLevel level) {
+ public static SettlementProjectSavedData get(ServerLevel level) {
return level.getDataStorage().computeIfAbsent(FACTORY, FILE_ID);
}
- public static BannerModSettlementProjectSavedData load(CompoundTag tag, HolderLookup.Provider registries) {
- SavedDataVersioning.migrate(tag, CURRENT_VERSION, "BannerModSettlementProjectSavedData");
- return new BannerModSettlementProjectSavedData(new BannerModSettlementProjectRuntime(
- BannerModSettlementProjectScheduler.fromTag(tag),
+ public static SettlementProjectSavedData load(CompoundTag tag, HolderLookup.Provider registries) {
+ SavedDataVersioning.migrate(tag, CURRENT_VERSION, "SettlementProjectSavedData");
+ return new SettlementProjectSavedData(new SettlementProjectRuntime(
+ SettlementProjectScheduler.fromTag(tag),
new BannerModBuildAreaProjectBridge()
));
}
@@ -47,7 +47,7 @@ public CompoundTag save(CompoundTag tag, HolderLookup.Provider registries) {
return tag;
}
- public BannerModSettlementProjectRuntime runtime() {
+ public SettlementProjectRuntime runtime() {
return this.runtime;
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectScheduler.java b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectScheduler.java
similarity index 95%
rename from src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectScheduler.java
rename to src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectScheduler.java
index de2339e6..c23bb798 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectScheduler.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectScheduler.java
@@ -26,12 +26,12 @@
*
* <p>Slice C-only concerns: bounded ingestion from the growth evaluator, bookkeeping,
* hand-off to {@link BannerModBuildAreaProjectBridge}, and NBT round-trip persistence
- * through {@link BannerModSettlementProjectSavedData}.
+ * through {@link SettlementProjectSavedData}.
*
* <p>Thread model: expected to be touched from the server thread only. No internal
* synchronization is provided.
*/
-public final class BannerModSettlementProjectScheduler {
+public final class SettlementProjectScheduler {
private static final Logger LOGGER = LogUtils.getLogger();
@@ -48,21 +48,21 @@ public final class BannerModSettlementProjectScheduler {
private Runnable dirtyListener = () -> {
};
- private BannerModSettlementProjectScheduler(@Nullable ServerLevel level) {
+ private SettlementProjectScheduler(@Nullable ServerLevel level) {
this.level = level;
}
/** Production entrypoint. One scheduler per {@link ServerLevel}. */
- public static BannerModSettlementProjectScheduler forServer(ServerLevel level) {
+ public static SettlementProjectScheduler forServer(ServerLevel level) {
if (level == null) {
throw new IllegalArgumentException("level must not be null");
}
- return new BannerModSettlementProjectScheduler(level);
+ return new SettlementProjectScheduler(level);
}
/** Package-private factory for unit tests that cannot instantiate a {@link ServerLevel}. */
- static BannerModSettlementProjectScheduler detached() {
- return new BannerModSettlementProjectScheduler(null);
+ static SettlementProjectScheduler detached() {
+ return new SettlementProjectScheduler(null);
}
public void setDirtyListener(Runnable dirtyListener) {
@@ -235,8 +235,8 @@ public CompoundTag toTag() {
return tag;
}
- public static BannerModSettlementProjectScheduler fromTag(CompoundTag tag) {
- BannerModSettlementProjectScheduler scheduler = detached();
+ public static SettlementProjectScheduler fromTag(CompoundTag tag) {
+ SettlementProjectScheduler scheduler = detached();
scheduler.restoreFromTag(tag);
return scheduler;
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectWorldExecution.java b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectWorldExecution.java
similarity index 90%
rename from src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectWorldExecution.java
rename to src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectWorldExecution.java
index 24d8434e..56498607 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectWorldExecution.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/project/SettlementProjectWorldExecution.java
@@ -3,7 +3,7 @@
import com.talhanation.bannermod.entity.civilian.workarea.BuildArea;
import com.talhanation.bannermod.events.ClaimEvents;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
import com.talhanation.bannermod.settlement.growth.PendingProject;
import com.talhanation.bannermod.settlement.growth.ProjectBlocker;
import com.talhanation.bannermod.settlement.prefab.BuildingPlacementService;
@@ -23,9 +23,9 @@
import java.util.List;
import java.util.UUID;
-final class BannerModSettlementProjectWorldExecution {
+final class SettlementProjectWorldExecution {
- private BannerModSettlementProjectWorldExecution() {
+ private SettlementProjectWorldExecution() {
}
static boolean ensureExecutableTarget(ServerLevel level, UUID claimUuid, PendingProject project) {
@@ -62,8 +62,8 @@ private static RecruitsClaim resolveClaim(UUID claimUuid) {
return null;
}
- private static ResourceLocation prefabIdFor(BannerModSettlementBuildingProfileSeed profileSeed) {
- return switch (profileSeed == null ? BannerModSettlementBuildingProfileSeed.GENERAL : profileSeed) {
+ private static ResourceLocation prefabIdFor(SettlementBuildingProfileSeed profileSeed) {
+ return switch (profileSeed == null ? SettlementBuildingProfileSeed.GENERAL : profileSeed) {
case FOOD_PRODUCTION -> FarmPrefab.ID;
case MATERIAL_PRODUCTION -> LumberCampPrefab.ID;
case STORAGE -> StoragePrefab.ID;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementClaimBindingService.java b/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementClaimBindingService.java
index 53826b7b..0fd088a0 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementClaimBindingService.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementClaimBindingService.java
@@ -19,8 +19,8 @@
import com.talhanation.bannermod.governance.BannerModGovernorManager;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
import com.talhanation.bannermod.persistence.military.RecruitsClaimManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementService;
import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
import com.talhanation.bannermod.util.RuntimeProfilingCounters;
import net.minecraft.core.BlockPos;
@@ -39,7 +39,7 @@
/**
* Owns the claim-refresh and worker-binding repair pipeline that was previously embedded inside
- * {@link BannerModSettlementService}. Snapshot construction and lookup helpers stay on the
+ * {@link SettlementService}. Snapshot construction and lookup helpers stay on the
* orchestrator service; this class only handles iterating claims, putting snapshots, and repairing
* worker bindings against canonical validated buildings.
*/
@@ -49,14 +49,14 @@ private SettlementClaimBindingService() {
public static void refreshAllClaims(ServerLevel level,
RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
+ SettlementManager settlementManager,
BannerModGovernorManager governorManager) {
refreshClaimsBatch(level, claimManager, settlementManager, governorManager, 0, Integer.MAX_VALUE);
}
public static BatchResult refreshClaimsBatch(ServerLevel level,
RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
+ SettlementManager settlementManager,
BannerModGovernorManager governorManager,
int startIndex,
int maxClaims) {
@@ -79,7 +79,7 @@ public static BatchResult refreshClaimsBatch(ServerLevel level,
int clampedStart = Math.max(0, Math.min(startIndex, total));
int endIndex = Math.min(total, clampedStart + maxClaims);
for (int i = clampedStart; i < endIndex; i++) {
- settlementManager.putSnapshot(BannerModSettlementService.buildSnapshot(level, claims.get(i), governorManager));
+ settlementManager.putSnapshot(SettlementService.buildSnapshot(level, claims.get(i), governorManager));
}
if (endIndex >= total) {
@@ -109,7 +109,7 @@ private static BatchResult completedResult() {
public static void refreshClaimAt(ServerLevel level,
RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
+ SettlementManager settlementManager,
BannerModGovernorManager governorManager,
BlockPos pos) {
if (level == null || claimManager == null || settlementManager == null || pos == null) {
@@ -120,7 +120,7 @@ public static void refreshClaimAt(ServerLevel level,
public static void refreshClaim(ServerLevel level,
RecruitsClaimManager claimManager,
- BannerModSettlementManager settlementManager,
+ SettlementManager settlementManager,
@Nullable BannerModGovernorManager governorManager,
@Nullable RecruitsClaim claim) {
if (level == null || claimManager == null || settlementManager == null) {
@@ -129,7 +129,7 @@ public static void refreshClaim(ServerLevel level,
if (claim == null) {
return;
}
- settlementManager.putSnapshot(BannerModSettlementService.buildSnapshot(level, claim, governorManager));
+ settlementManager.putSnapshot(SettlementService.buildSnapshot(level, claim, governorManager));
}
public static void repairClaimState(ServerLevel level,
@@ -139,12 +139,12 @@ public static void repairClaimState(ServerLevel level,
if (level == null || claim == null) {
return;
}
- Map<UUID, UUID> canonicalBindings = BannerModSettlementService.buildCanonicalWorkAreaBindings(validatedBuildings, workAreas);
+ Map<UUID, UUID> canonicalBindings = SettlementService.buildCanonicalWorkAreaBindings(validatedBuildings, workAreas);
Map<UUID, AbstractWorkAreaEntity> areasById = new LinkedHashMap<>();
for (AbstractWorkAreaEntity workArea : workAreas) {
areasById.put(workArea.getUUID(), workArea);
}
- for (AbstractWorkerEntity worker : BannerModSettlementService.workersInClaim(level, claim)) {
+ for (AbstractWorkerEntity worker : SettlementService.workersInClaim(level, claim)) {
repairWorkerBinding(worker, workAreas, canonicalBindings, areasById);
}
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementHeartbeatService.java b/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementHeartbeatService.java
index 77802b62..89d8f475 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementHeartbeatService.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementHeartbeatService.java
@@ -3,9 +3,9 @@
import com.talhanation.bannermod.events.ClaimEvents;
import com.talhanation.bannermod.governance.BannerModGovernorHeartbeat;
import com.talhanation.bannermod.governance.BannerModGovernorManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementOrchestrator;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementOrchestrator;
+import com.talhanation.bannermod.settlement.SettlementService;
import com.talhanation.bannermod.util.AdaptiveRuntimeBudgets;
import com.talhanation.bannermod.util.RuntimeProfilingCounters;
import net.minecraft.server.level.ServerLevel;
@@ -46,7 +46,7 @@ public void tick(ServerLevel level) {
private void tickGovernorMaintenance(ServerLevel level) {
BannerModGovernorManager governorManager = BannerModGovernorManager.get(level);
- BannerModSettlementManager settlementManager = BannerModSettlementManager.get(level);
+ SettlementManager settlementManager = SettlementManager.get(level);
if (governorMaintenanceStage == GOVERNOR_STAGE_HEARTBEAT) {
long startNanos = System.nanoTime();
@@ -64,7 +64,7 @@ private void tickGovernorMaintenance(ServerLevel level) {
if (governorMaintenanceStage == GOVERNOR_STAGE_REFRESH) {
long startNanos = System.nanoTime();
- SettlementClaimBindingService.BatchResult result = BannerModSettlementService.refreshClaimsBatch(
+ SettlementClaimBindingService.BatchResult result = SettlementService.refreshClaimsBatch(
level,
ClaimEvents.claimManager(),
settlementManager,
@@ -79,7 +79,7 @@ private void tickGovernorMaintenance(ServerLevel level) {
if (governorMaintenanceStage == GOVERNOR_STAGE_ORCHESTRATOR) {
long startNanos = System.nanoTime();
- BannerModSettlementOrchestrator.BatchResult result = BannerModSettlementOrchestrator.tickBatch(
+ SettlementOrchestrator.BatchResult result = SettlementOrchestrator.tickBatch(
level,
settlementManager,
governorManager,
diff --git a/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementSeaTradeAnalyzer.java b/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementSeaTradeAnalyzer.java
new file mode 100644
index 00000000..7f606563
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/runtime/SettlementSeaTradeAnalyzer.java
@@ -0,0 +1,114 @@
+package com.talhanation.bannermod.settlement.runtime;
+
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodSnapshot;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeExecutionRecord;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeSummary;
+import net.minecraft.resources.ResourceLocation;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+
+public final class SettlementSeaTradeAnalyzer {
+ private SettlementSeaTradeAnalyzer() {
+ }
+
+ public static List<SettlementDesiredGoodSnapshot> desiredGoods(BannerModSeaTradeSummary.Summary seaTradeSummary) {
+ List<SettlementDesiredGoodSnapshot> desiredGoods = new ArrayList<>();
+ for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.importableByItem().entrySet()) {
+ desiredGoods.add(new SettlementDesiredGoodSnapshot("sea_import:" + entry.getKey(), entry.getValue()));
+ }
+ for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.exportableByItem().entrySet()) {
+ desiredGoods.add(new SettlementDesiredGoodSnapshot("sea_export:" + entry.getKey(), entry.getValue()));
+ }
+ return desiredGoods;
+ }
+
+ public static int addCoverageUnits(String goodId,
+ int coverageUnits,
+ BannerModSeaTradeSummary.Summary seaTradeSummary) {
+ if (goodId == null || goodId.isBlank()) {
+ return coverageUnits;
+ }
+ if (goodId.startsWith("sea_import:")) {
+ ResourceLocation itemId = ResourceLocation.tryParse(goodId.substring("sea_import:".length()));
+ return coverageUnits + BannerModSeaTradeSummary.totalImportableCount(seaTradeSummary, itemId);
+ }
+ if (goodId.startsWith("sea_export:")) {
+ ResourceLocation itemId = ResourceLocation.tryParse(goodId.substring("sea_export:".length()));
+ return coverageUnits + BannerModSeaTradeSummary.totalExportableCount(seaTradeSummary, itemId);
+ }
+ return coverageUnits;
+ }
+
+ public static List<String> statusLines(BannerModSeaTradeSummary.Summary seaTradeSummary,
+ List<BannerModSeaTradeExecutionRecord> executionRecords) {
+ List<String> lines = new ArrayList<>();
+ for (BannerModSeaTradeExecutionRecord record : executionRecords) {
+ lines.add(executionStatusLine(record));
+ }
+ for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.importableByItem().entrySet()) {
+ lines.add("Sea import benefit: " + entry.getKey() + " x" + entry.getValue());
+ }
+ for (Map.Entry<ResourceLocation, Integer> entry : seaTradeSummary.exportableByItem().entrySet()) {
+ lines.add("Sea export benefit: " + entry.getKey() + " x" + entry.getValue());
+ }
+ for (String bottleneck : seaTradeSummary.bottlenecks()) {
+ lines.add("Sea trade bottleneck: " + bottleneck.toLowerCase(Locale.ROOT));
+ }
+ return lines;
+ }
+
+ private static String executionStatusLine(BannerModSeaTradeExecutionRecord record) {
+ String statusKey = switch (record.state()) {
+ case LOADING -> "loading";
+ case TRAVELLING -> "travelling";
+ case UNLOADING -> "unloading";
+ case COMPLETE -> "completed";
+ case FAILED -> BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER.equals(record.failureReason())
+ ? "missing_ship"
+ : "blocked_cargo";
+ };
+ return "gui.bannermod.governor.logistics.sea_trade." + statusKey + " "
+ + shortRouteId(record.routeId()) + " "
+ + carrierLabel(record.boundCarrierId()) + " "
+ + failureReasonKey(record.failureReason()) + " "
+ + filterLabel(record) + " "
+ + record.cargoCount() + " "
+ + record.requestedCount();
+ }
+
+ private static String carrierLabel(@Nullable UUID carrierId) {
+ return carrierId == null ? "unassigned" : shortRouteId(carrierId);
+ }
+
+ private static String failureReasonKey(String failureReason) {
+ if (failureReason == null || failureReason.isBlank()) {
+ return "gui.bannermod.governor.logistics.sea_trade.reason.none";
+ }
+ return switch (failureReason) {
+ case BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER -> "gui.bannermod.governor.logistics.sea_trade.reason.no_carrier";
+ case BannerModSeaTradeExecutionRecord.FAILURE_NO_CARGO_LOADED -> "gui.bannermod.governor.logistics.sea_trade.reason.no_cargo_loaded";
+ case BannerModSeaTradeExecutionRecord.FAILURE_SOURCE_SHORTAGE -> "gui.bannermod.governor.logistics.sea_trade.reason.source_shortage";
+ case BannerModSeaTradeExecutionRecord.FAILURE_DESTINATION_FULL -> "gui.bannermod.governor.logistics.sea_trade.reason.destination_full";
+ default -> "gui.bannermod.governor.logistics.sea_trade.reason.carrier_failed";
+ };
+ }
+
+ private static String shortRouteId(UUID routeId) {
+ String value = routeId.toString().replace("-", "");
+ return value.substring(Math.max(0, value.length() - 4));
+ }
+
+ private static String filterLabel(BannerModSeaTradeExecutionRecord record) {
+ return record.filter().itemIds().stream()
+ .sorted(Comparator.comparing(ResourceLocation::toString))
+ .map(ResourceLocation::toString)
+ .findFirst()
+ .orElse("any");
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/BuildingInvalidationRuntime.java b/src/main/java/com/talhanation/bannermod/settlement/validation/BuildingInvalidationRuntime.java
index af318168..45dae4a8 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/validation/BuildingInvalidationRuntime.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/BuildingInvalidationRuntime.java
@@ -54,7 +54,7 @@ public static BatchResult tickBatch(ServerLevel level, int maxPerTick) {
return new BatchResult(0, 0, queue.size());
}
- DefaultBuildingValidator validator = new DefaultBuildingValidator(new BuildingDefinitionRegistry());
+ SettlementBuildingValidator validator = new SettlementBuildingValidator(new BuildingDefinitionRegistry());
int processed = 0;
int degraded = 0;
for (BuildingInvalidationQueueData.QueueEntry entry : batch) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/DefaultBuildingValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/DefaultBuildingValidator.java
deleted file mode 100644
index 1e42276e..00000000
--- a/src/main/java/com/talhanation/bannermod/settlement/validation/DefaultBuildingValidator.java
+++ /dev/null
@@ -1,979 +0,0 @@
-package com.talhanation.bannermod.settlement.validation;
-
-import com.talhanation.bannermod.config.WorkersServerConfig;
-import com.talhanation.bannermod.settlement.building.BuildingDefinition;
-import com.talhanation.bannermod.settlement.building.BuildingDefinitionRegistry;
-import com.talhanation.bannermod.settlement.building.BuildingType;
-import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
-import com.talhanation.bannermod.settlement.building.ValidatedBuildingRegistryData;
-import com.talhanation.bannermod.settlement.building.ZoneRole;
-import com.talhanation.bannermod.settlement.building.ZoneSelection;
-import com.talhanation.bannermod.settlement.validation.types.BuildingTypeValidatorDispatcher;
-import com.talhanation.bannermod.settlement.validation.types.BuildingValidationContext;
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.block.AnvilBlock;
-import net.minecraft.world.level.block.BannerBlock;
-import net.minecraft.world.level.block.BedBlock;
-import net.minecraft.world.level.block.BlastFurnaceBlock;
-import net.minecraft.world.level.block.CropBlock;
-import net.minecraft.world.level.block.FurnaceBlock;
-import net.minecraft.world.level.block.SaplingBlock;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-import net.minecraft.world.level.block.entity.BarrelBlockEntity;
-import net.minecraft.world.level.block.entity.ChestBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.EnumMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-public class DefaultBuildingValidator implements BuildingValidator {
- private static final int MAX_ZONE_VOLUME = 262_144;
- private static final Set<RolePair> PROHIBITED_OVERLAP_ROLE_PAIRS = prohibitedRolePairs();
-
- private final BuildingDefinitionRegistry definitionRegistry;
- private final BuildingTypeValidatorDispatcher typeValidatorDispatcher;
-
- public DefaultBuildingValidator(BuildingDefinitionRegistry definitionRegistry) {
- this(definitionRegistry, new BuildingTypeValidatorDispatcher());
- }
-
- public DefaultBuildingValidator(BuildingDefinitionRegistry definitionRegistry,
- BuildingTypeValidatorDispatcher typeValidatorDispatcher) {
- this.definitionRegistry = definitionRegistry;
- this.typeValidatorDispatcher = typeValidatorDispatcher;
- }
-
- @Override
- public BuildingValidationResult validate(ServerLevel level, Player player, BuildingValidationRequest request) {
- if (level == null || request == null) {
- return BuildingValidationResult.blockingFailure(null, "invalid_request", "Validation request is missing.");
- }
- Optional<BuildingDefinition> optionalDefinition = this.definitionRegistry.get(request.type());
- if (optionalDefinition.isEmpty()) {
- return BuildingValidationResult.blockingFailure(request.type(), "unknown_building_type", "No building definition is registered.");
- }
-
- BuildingDefinition definition = optionalDefinition.get();
- List<ValidationIssue> blocking = new ArrayList<>();
- List<ValidationIssue> warnings = new ArrayList<>();
-
- validateSelection(request, definition, blocking);
- if (request.enforceOverlapChecks()) {
- validateOverlap(level, request, blocking);
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, null);
- }
-
- EnumMap<ZoneRole, ZoneSelection> zonesByRole = toRoleMap(request.zones());
- BuildingValidationContext context = new BuildingValidationContext(level, player, request, zonesByRole, warnings, blocking);
- return this.typeValidatorDispatcher.validate(context, this::validateByTypeFallback);
- }
-
- private BuildingValidationResult validateByTypeFallback(BuildingValidationContext context) {
- BuildingValidationRequest request = context.request();
- Map<ZoneRole, ZoneSelection> zonesByRole = context.zonesByRole();
- List<ValidationIssue> warnings = context.warnings();
- List<ValidationIssue> blocking = context.blocking();
-
- return switch (request.type()) {
- case STARTER_FORT -> validateStarterFort(context.level(), request, zonesByRole, warnings, blocking);
- case HOUSE -> validateHouse(context.level(), request, zonesByRole, warnings, blocking);
- case FARM -> validateFarm(context.level(), request, zonesByRole, warnings, blocking);
- case MINE -> validateMine(context.level(), request, zonesByRole, warnings, blocking);
- case LUMBER_CAMP -> validateLumberCamp(context.level(), request, zonesByRole, warnings, blocking);
- case SMITHY -> validateSmithy(context.level(), request, zonesByRole, warnings, blocking);
- case STORAGE -> validateStorage(context.level(), request, zonesByRole, warnings, blocking);
- case ARCHITECT_WORKSHOP -> validateArchitectWorkshop(context.level(), request, zonesByRole, warnings, blocking);
- case BARRACKS -> validateBarracks(context.level(), request, zonesByRole, warnings, blocking);
- default -> BuildingValidationResult.blockingFailure(request.type(), "validator_not_implemented", "Validator pipeline for this building type is not implemented yet.");
- };
- }
-
- @Override
- public BuildingValidationResult revalidate(ServerLevel level, ValidatedBuildingRecord building) {
- if (level == null || building == null) {
- return BuildingValidationResult.blockingFailure(null, "invalid_revalidation_request", "Revalidation request is missing.");
- }
- BuildingValidationRequest request = new BuildingValidationRequest(
- building.settlementId(),
- building.type(),
- building.anchorPos(),
- building.zones(),
- false
- );
- BuildingValidationResult result = validate(level, null, request);
- if (result.valid() || building.type() != BuildingType.HOUSE) {
- return result;
- }
- // Recovery is meant to repair a previously-validated house whose zones became stale;
- // a record with no zones at all (e.g. test fixture or corrupted persistence) has nothing
- // to repair, so latching onto any nearby bed in the world would be a false positive.
- if (building.zones().isEmpty()) {
- return result;
- }
-
- BuildingValidationRequest recoveredHouseRequest = tryRecoverHouseRequest(level, building);
- if (recoveredHouseRequest == null) {
- return result;
- }
- BuildingValidationResult recovered = validate(level, null, recoveredHouseRequest);
- return recovered.valid() ? recovered : result;
- }
-
- private void validateSelection(BuildingValidationRequest request,
- BuildingDefinition definition,
- List<ValidationIssue> blocking) {
- if (request.zones().isEmpty()) {
- blocking.add(new ValidationIssue("selection_missing", "No zones selected.", ValidationSeverity.BLOCKING));
- return;
- }
- EnumMap<ZoneRole, ZoneSelection> zonesByRole = toRoleMap(request.zones());
- for (ZoneRole requiredRole : definition.requiredZones()) {
- if (!zonesByRole.containsKey(requiredRole)) {
- blocking.add(new ValidationIssue(
- "required_zone_missing",
- "Required zone is missing: " + requiredRole.name(),
- ValidationSeverity.BLOCKING
- ));
- }
- }
- for (ZoneSelection zone : request.zones()) {
- if (zone.volume() <= 0) {
- blocking.add(new ValidationIssue("invalid_zone_volume", "Zone has invalid volume.", ValidationSeverity.BLOCKING));
- continue;
- }
- if (zone.volume() > MAX_ZONE_VOLUME) {
- blocking.add(new ValidationIssue(
- "zone_too_large",
- "Zone exceeds max MVP volume: " + zone.volume(),
- ValidationSeverity.BLOCKING
- ));
- }
- }
- if (!isAnchorCovered(request.anchorPos(), request.zones())) {
- blocking.add(new ValidationIssue(
- "anchor_outside_selection",
- "Anchor must be inside at least one selected zone.",
- ValidationSeverity.BLOCKING
- ));
- }
- }
-
- private void validateOverlap(ServerLevel level,
- BuildingValidationRequest request,
- List<ValidationIssue> blocking) {
- ValidatedBuildingSnapshot snapshot = buildSnapshot(request);
- List<ValidatedBuildingRecord> intersecting = ValidatedBuildingRegistryData.get(level).findIntersecting(snapshot.bounds());
- for (ValidatedBuildingRecord existing : intersecting) {
- if (!existing.settlementId().equals(request.settlementId())) {
- continue;
- }
- if (existing.type() == request.type()) {
- continue;
- }
- for (ZoneSelection incomingZone : request.zones()) {
- if (incomingZone == null) {
- continue;
- }
- for (ZoneSelection existingZone : existing.zones()) {
- if (existingZone == null) {
- continue;
- }
- if (!PROHIBITED_OVERLAP_ROLE_PAIRS.contains(new RolePair(incomingZone.role(), existingZone.role()))) {
- continue;
- }
- if (!zonesOverlapByBlockVolume(incomingZone, existingZone)) {
- continue;
- }
- blocking.add(new ValidationIssue(
- "overlap_conflict",
- "Building overlaps conflicting zones (" + incomingZone.role().name() + " vs " + existingZone.role().name() + ") with existing " + existing.type().name() + ".",
- ValidationSeverity.BLOCKING
- ));
- return;
- }
- }
- }
- }
-
- private static Set<RolePair> prohibitedRolePairs() {
- Set<RolePair> pairs = new HashSet<>();
- List<ZoneRole> primaryRoles = Arrays.asList(ZoneRole.INTERIOR, ZoneRole.SLEEPING, ZoneRole.WORK_ZONE);
- for (ZoneRole left : primaryRoles) {
- for (ZoneRole right : primaryRoles) {
- pairs.add(new RolePair(left, right));
- }
- }
- return Set.copyOf(pairs);
- }
-
- private BuildingValidationResult validateStarterFort(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection interior = zonesByRole.get(ZoneRole.INTERIOR);
- if (interior == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "interior_missing", "Fort interior zone is required.");
- }
- ZoneSelection authorityPoint = zonesByRole.get(ZoneRole.AUTHORITY_POINT);
- if (authorityPoint == null || !authorityPoint.contains(request.anchorPos())) {
- warnings.add(new ValidationIssue("fort_authority_unclear", "Fort authority point is missing or does not include anchor.", ValidationSeverity.WARNING));
- }
-
- int bannerRadius = WorkersServerConfig.settlementFortBannerMaxDistance();
- if (!hasBannerNearAnchor(level, request.anchorPos(), bannerRadius)) {
- warnings.add(new ValidationIssue("banner_missing", "No banner found within " + bannerRadius + " blocks of fort anchor.", ValidationSeverity.WARNING));
- }
-
- InteriorStats stats = scanInterior(level, interior);
- if (stats.walkableBlocks < 64) {
- blocking.add(new ValidationIssue("fort_walkable_too_small", "Fort interior needs at least 64 walkable blocks around the courtyard and wings.", ValidationSeverity.BLOCKING));
- }
- if (stats.roofCoverage < 0.60D) {
- warnings.add(new ValidationIssue("fort_roof_too_open", "Fort roof coverage is low. A more sheltered interior is recommended.", ValidationSeverity.WARNING));
- }
- if (!hasEntrance(interior, level)) {
- warnings.add(new ValidationIssue("fort_entrance_unclear", "Fort entrance is unclear for current selection; manual review recommended.", ValidationSeverity.WARNING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
-
- int qualityScore = Math.min(100, (int) Math.round((stats.roofCoverage * 0.70D + Math.min(1.0D, stats.walkableBlocks / 128.0D) * 0.30D) * 100.0D));
- return BuildingValidationResult.success(request.type(), 4, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateHouse(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection interior = zonesByRole.get(ZoneRole.INTERIOR);
- ZoneSelection sleeping = zonesByRole.get(ZoneRole.SLEEPING);
- if (interior == null || sleeping == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "house_zones_missing", "House requires INTERIOR and SLEEPING zones.");
- }
-
- InteriorStats stats = scanInterior(level, interior);
- int validBeds = countBeds(level, sleeping);
- if (stats.walkableBlocks < 8) {
- blocking.add(new ValidationIssue("house_walkable_too_small", "House requires at least 8 walkable interior blocks.", ValidationSeverity.BLOCKING));
- }
- if (stats.roofCoverage < 0.70D) {
- blocking.add(new ValidationIssue("house_roof_too_open", "House requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
- }
- if (validBeds < 1) {
- validBeds = countBedsNearZone(level, sleeping, 1);
- }
- if (validBeds < 1) {
- validBeds = countBeds(level, interior);
- }
- if (validBeds < 1) {
- validBeds = countBedsNearZone(level, interior, 1);
- }
- if (validBeds < 1 && findNearestBed(level, request.anchorPos(), 12) != null) {
- validBeds = 1;
- }
- if (validBeds < 1) {
- blocking.add(new ValidationIssue("house_bed_missing", "House requires at least one bed in sleeping zone.", ValidationSeverity.BLOCKING));
- }
- if (!hasEntrance(interior, level)) {
- warnings.add(new ValidationIssue("house_entrance_missing", "House entrance is unclear for current selection.", ValidationSeverity.WARNING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
-
- int capacity = Math.min(validBeds, stats.walkableBlocks / 8);
- if (capacity < 1) {
- capacity = 1;
- warnings.add(new ValidationIssue("house_capacity_clamped", "House passed with minimum capacity due to tight interior space.", ValidationSeverity.WARNING));
- }
- int qualityScore = Math.min(100, (int) Math.round(stats.roofCoverage * 100.0D));
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateFarm(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection workZone = zonesByRole.get(ZoneRole.WORK_ZONE);
- if (workZone == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "farm_work_zone_missing", "Farm requires a WORK_ZONE.");
- }
- double anchorDistance = distanceToZone(request.anchorPos(), workZone);
- if (anchorDistance > 24.0D) {
- blocking.add(new ValidationIssue("farm_anchor_too_far", "Farm anchor must be within 24 blocks of work zone.", ValidationSeverity.BLOCKING));
- }
-
- int farmlandBlocks = countFarmlandBlocks(level, workZone);
- if (farmlandBlocks < 24) {
- blocking.add(new ValidationIssue("farm_farmland_too_small", "Farm requires at least 24 farmland/crop-capable blocks.", ValidationSeverity.BLOCKING));
- }
-
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
- int capacity = clamp(farmlandBlocks / 48, 1, 4);
- int qualityScore = Math.min(100, farmlandBlocks);
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateMine(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection workZone = zonesByRole.get(ZoneRole.WORK_ZONE);
- if (workZone == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "mine_work_zone_missing", "Mine requires a WORK_ZONE.");
- }
- double anchorDistance = distanceToZone(request.anchorPos(), workZone);
- if (anchorDistance > 32.0D) {
- blocking.add(new ValidationIssue("mine_anchor_too_far", "Mine anchor must be within 32 blocks of work zone.", ValidationSeverity.BLOCKING));
- }
- if (level.canSeeSky(request.anchorPos().above())) {
- warnings.add(new ValidationIssue("mine_anchor_unsheltered", "Mine anchor is exposed to sky. A covered shed is recommended.", ValidationSeverity.WARNING));
- }
-
- int validMineFaceBlocks = countMineFaceBlocks(level, workZone);
- if (validMineFaceBlocks < 24) {
- blocking.add(new ValidationIssue("mine_face_too_small", "Mine requires at least 24 exposed stone/ore/deepslate blocks.", ValidationSeverity.BLOCKING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
- int capacity = clamp(1 + (validMineFaceBlocks / 64), 1, 4);
- int qualityScore = Math.min(100, validMineFaceBlocks);
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateLumberCamp(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection workZone = zonesByRole.get(ZoneRole.WORK_ZONE);
- if (workZone == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "lumber_work_zone_missing", "Lumber camp requires a WORK_ZONE.");
- }
- double anchorDistance = distanceToZone(request.anchorPos(), workZone);
- if (anchorDistance > 32.0D) {
- blocking.add(new ValidationIssue("lumber_anchor_too_far", "Lumber camp anchor must be within 32 blocks of work zone.", ValidationSeverity.BLOCKING));
- }
-
- int logCount = countLogs(level, workZone);
- int saplingCount = countSaplings(level, workZone);
- int productivity = logCount + (saplingCount / 2);
- if (productivity < 12) {
- blocking.add(new ValidationIssue("lumber_resources_too_small", "Lumber camp requires enough logs/saplings in zone.", ValidationSeverity.BLOCKING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
- int capacity = clamp(productivity / 12, 1, 3);
- int qualityScore = Math.min(100, productivity * 2);
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateSmithy(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection interior = zonesByRole.get(ZoneRole.INTERIOR);
- ZoneSelection workZone = zonesByRole.get(ZoneRole.WORK_ZONE);
- if (interior == null || workZone == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "smithy_zones_missing", "Smithy requires INTERIOR and WORK_ZONE zones.");
- }
-
- InteriorStats interiorStats = scanInterior(level, interior);
- if (interiorStats.roofCoverage < 0.70D) {
- blocking.add(new ValidationIssue("smithy_roof_too_open", "Smithy requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
- }
-
- List<BlockPos> anvilPositions = collectPositions(level, workZone, state -> state.getBlock() instanceof AnvilBlock);
- List<BlockPos> furnacePositions = collectPositions(level, workZone, state -> state.getBlock() instanceof FurnaceBlock || state.getBlock() instanceof BlastFurnaceBlock);
- if (anvilPositions.isEmpty()) {
- blocking.add(new ValidationIssue("smithy_anvil_missing", "Smithy requires at least one anvil in work zone.", ValidationSeverity.BLOCKING));
- }
- if (furnacePositions.isEmpty()) {
- blocking.add(new ValidationIssue("smithy_furnace_missing", "Smithy requires at least one furnace or blast furnace in work zone.", ValidationSeverity.BLOCKING));
- }
- if (!anvilPositions.isEmpty() && !furnacePositions.isEmpty() && !hasCloseAnvilFurnacePair(anvilPositions, furnacePositions, 4.0D)) {
- blocking.add(new ValidationIssue("smithy_anchor_set_too_far", "Anvil must be within 4 blocks of a furnace or blast furnace.", ValidationSeverity.BLOCKING));
- }
-
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
- int anchorSets = Math.min(anvilPositions.size(), furnacePositions.size());
- int capacity = Math.min(Math.min(anchorSets, interiorStats.walkableBlocks / 16), 2);
- if (capacity < 1) {
- capacity = 1;
- warnings.add(new ValidationIssue("smithy_capacity_clamped", "Smithy passed with minimum capacity due to limited interior space.", ValidationSeverity.WARNING));
- }
- int qualityScore = Math.min(100, (int) Math.round(interiorStats.roofCoverage * 100.0D));
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateStorage(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection storageZone = zonesByRole.get(ZoneRole.STORAGE);
- if (storageZone == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "storage_zone_missing", "Storage requires a STORAGE zone.");
- }
-
- int containerCount = countContainers(level, storageZone);
- if (containerCount < 1) {
- blocking.add(new ValidationIssue("storage_containers_missing", "Storage requires at least one container (chest/barrel).", ValidationSeverity.BLOCKING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
- int qualityScore = Math.min(100, containerCount * 10);
- return BuildingValidationResult.success(request.type(), 0, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateArchitectWorkshop(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection interior = zonesByRole.get(ZoneRole.INTERIOR);
- ZoneSelection workZone = zonesByRole.get(ZoneRole.WORK_ZONE);
- if (interior == null || workZone == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "architect_zones_missing", "Architect workshop requires INTERIOR and WORK_ZONE zones.");
- }
- InteriorStats interiorStats = scanInterior(level, interior);
- if (interiorStats.walkableBlocks < 16) {
- blocking.add(new ValidationIssue("architect_walkable_too_small", "Architect workshop requires at least 16 walkable interior blocks.", ValidationSeverity.BLOCKING));
- }
- if (interiorStats.roofCoverage < 0.70D) {
- blocking.add(new ValidationIssue("architect_roof_too_open", "Architect workshop requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
- }
-
- int draftingTables = countBlocks(level, workZone, Blocks.CRAFTING_TABLE);
- if (draftingTables < 1) {
- blocking.add(new ValidationIssue("architect_table_missing", "Architect workshop requires at least one drafting table (crafting table placeholder).", ValidationSeverity.BLOCKING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
-
- int capacityByArea = Math.max(1, interiorStats.walkableBlocks / 24);
- int capacity = Math.min(draftingTables, capacityByArea);
- int qualityScore = Math.min(100, (int) Math.round(interiorStats.roofCoverage * 100.0D));
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private BuildingValidationResult validateBarracks(ServerLevel level,
- BuildingValidationRequest request,
- Map<ZoneRole, ZoneSelection> zonesByRole,
- List<ValidationIssue> warnings,
- List<ValidationIssue> blocking) {
- ZoneSelection interior = zonesByRole.get(ZoneRole.INTERIOR);
- ZoneSelection sleeping = zonesByRole.get(ZoneRole.SLEEPING);
- ZoneSelection storage = zonesByRole.get(ZoneRole.STORAGE);
- if (interior == null || sleeping == null || storage == null) {
- return BuildingValidationResult.blockingFailure(request.type(), "barracks_zones_missing", "Barracks requires INTERIOR, SLEEPING, and STORAGE zones.");
- }
-
- InteriorStats interiorStats = scanInterior(level, interior);
- if (interiorStats.walkableBlocks < 16) {
- blocking.add(new ValidationIssue("barracks_walkable_too_small", "Barracks requires at least 16 walkable interior blocks.", ValidationSeverity.BLOCKING));
- }
- if (interiorStats.roofCoverage < 0.70D) {
- blocking.add(new ValidationIssue("barracks_roof_too_open", "Barracks requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
- }
-
- int beds = countBeds(level, sleeping);
- if (beds < 2) {
- beds = Math.max(beds, countBedsNearZone(level, sleeping, 1));
- }
- if (beds < 2) {
- blocking.add(new ValidationIssue("barracks_beds_missing", "Barracks requires at least two beds or bunks in the sleeping zone.", ValidationSeverity.BLOCKING));
- }
-
- int containers = countContainers(level, storage);
- if (containers < 1) {
- blocking.add(new ValidationIssue("barracks_storage_missing", "Barracks requires at least one chest or barrel in the storage zone.", ValidationSeverity.BLOCKING));
- }
- if (!hasEntrance(interior, level)) {
- warnings.add(new ValidationIssue("barracks_entrance_unclear", "Barracks entrance is unclear for current selection.", ValidationSeverity.WARNING));
- }
- if (!blocking.isEmpty()) {
- return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, buildSnapshot(request));
- }
-
- int capacity = clamp(Math.max(1, beds), 1, 4);
- int qualityScore = Math.min(100, (int) Math.round(interiorStats.roofCoverage * 100.0D));
- return BuildingValidationResult.success(request.type(), capacity, qualityScore, warnings, buildSnapshot(request));
- }
-
- private static EnumMap<ZoneRole, ZoneSelection> toRoleMap(List<ZoneSelection> zones) {
- EnumMap<ZoneRole, ZoneSelection> map = new EnumMap<>(ZoneRole.class);
- for (ZoneSelection zone : zones) {
- if (zone == null) {
- continue;
- }
- map.putIfAbsent(zone.role(), zone);
- }
- return map;
- }
-
- private static boolean isAnchorCovered(BlockPos anchor, List<ZoneSelection> zones) {
- if (anchor == null) {
- return false;
- }
- for (ZoneSelection zone : zones) {
- if (zone != null && zone.contains(anchor)) {
- return true;
- }
- }
- return false;
- }
-
- private static InteriorStats scanInterior(ServerLevel level, ZoneSelection interior) {
- int minX = Math.min(interior.min().getX(), interior.max().getX());
- int minY = Math.min(interior.min().getY(), interior.max().getY());
- int minZ = Math.min(interior.min().getZ(), interior.max().getZ());
- int maxX = Math.max(interior.min().getX(), interior.max().getX());
- int maxY = Math.max(interior.min().getY(), interior.max().getY());
- int maxZ = Math.max(interior.min().getZ(), interior.max().getZ());
-
- int walkable = 0;
- int roofed = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- BlockPos.MutableBlockPos offsetPos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- pos.set(x, y, z);
- BlockState state = level.getBlockState(pos);
- BlockState above = level.getBlockState(offsetPos.setWithOffset(pos, 0, 1, 0));
- BlockState below = level.getBlockState(offsetPos.setWithOffset(pos, 0, -1, 0));
- if (!state.isAir() || !above.isAir() || !below.isSolid()) {
- continue;
- }
- walkable++;
- if (hasRoofCover(level, pos)) {
- roofed++;
- }
- }
- }
- }
- double roofCoverage = walkable == 0 ? 0.0D : (double) roofed / (double) walkable;
- return new InteriorStats(walkable, roofCoverage);
- }
-
- private static boolean hasRoofCover(ServerLevel level, BlockPos pos) {
- BlockPos.MutableBlockPos roofPos = new BlockPos.MutableBlockPos();
- int maxY = Math.min(level.getMaxBuildHeight() - 1, pos.getY() + 8);
- for (int y = pos.getY() + 2; y <= maxY; y++) {
- roofPos.set(pos.getX(), y, pos.getZ());
- if (!level.getBlockState(roofPos).isAir()) {
- return true;
- }
- }
- return false;
- }
-
- private static int countBeds(ServerLevel level, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- int beds = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- if (level.getBlockState(pos.set(x, y, z)).getBlock() instanceof BedBlock) {
- beds++;
- }
- }
- }
- }
- return beds;
- }
-
- private static int countBedsNearZone(ServerLevel level, ZoneSelection zone, int expansion) {
- int minX = Math.min(zone.min().getX(), zone.max().getX()) - expansion;
- int minY = Math.min(zone.min().getY(), zone.max().getY()) - expansion;
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ()) - expansion;
- int maxX = Math.max(zone.min().getX(), zone.max().getX()) + expansion;
- int maxY = Math.max(zone.min().getY(), zone.max().getY()) + expansion;
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ()) + expansion;
- int beds = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- if (level.getBlockState(pos.set(x, y, z)).getBlock() instanceof BedBlock) {
- beds++;
- }
- }
- }
- }
- return beds;
- }
-
- private static BuildingValidationRequest tryRecoverHouseRequest(ServerLevel level, ValidatedBuildingRecord building) {
- BlockPos bedPos = findNearestBed(level, building.anchorPos(), 12);
- if (bedPos == null) {
- return null;
- }
- ZoneSelection interior = new ZoneSelection(
- ZoneRole.INTERIOR,
- bedPos.offset(-1, 0, -1),
- bedPos.offset(2, 1, 2),
- bedPos
- );
- ZoneSelection sleeping = new ZoneSelection(
- ZoneRole.SLEEPING,
- bedPos,
- bedPos,
- bedPos
- );
- return new BuildingValidationRequest(
- building.settlementId(),
- BuildingType.HOUSE,
- bedPos,
- List.of(interior, sleeping),
- false
- );
- }
-
- private static BlockPos findNearestBed(ServerLevel level, BlockPos origin, int radius) {
- BlockPos nearest = null;
- double bestDistance = Double.MAX_VALUE;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = origin.getX() - radius; x <= origin.getX() + radius; x++) {
- for (int y = origin.getY() - radius; y <= origin.getY() + radius; y++) {
- for (int z = origin.getZ() - radius; z <= origin.getZ() + radius; z++) {
- pos.set(x, y, z);
- if (!(level.getBlockState(pos).getBlock() instanceof BedBlock)) {
- continue;
- }
- double distance = origin.distSqr(pos);
- if (distance < bestDistance) {
- bestDistance = distance;
- nearest = pos.immutable();
- }
- }
- }
- }
- return nearest;
- }
-
- private static int countFarmlandBlocks(ServerLevel level, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- int farmland = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- BlockPos.MutableBlockPos abovePos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- pos.set(x, y, z);
- BlockState state = level.getBlockState(pos);
- BlockState above = level.getBlockState(abovePos.setWithOffset(pos, 0, 1, 0));
- if (state.is(Blocks.FARMLAND) || above.getBlock() instanceof CropBlock) {
- farmland++;
- }
- }
- }
- }
- return farmland;
- }
-
- private static int countContainers(ServerLevel level, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- int containers = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- Object blockEntity = level.getBlockEntity(pos.set(x, y, z));
- if (blockEntity instanceof ChestBlockEntity || blockEntity instanceof BarrelBlockEntity) {
- containers++;
- }
- }
- }
- }
- return containers;
- }
-
- private static int countMineFaceBlocks(ServerLevel level, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- int blocks = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- BlockState state = level.getBlockState(pos.set(x, y, z));
- if (state.is(Blocks.STONE) || state.is(Blocks.DEEPSLATE) || state.is(Blocks.COBBLESTONE)
- || state.is(Blocks.COAL_ORE) || state.is(Blocks.IRON_ORE) || state.is(Blocks.COPPER_ORE)
- || state.is(Blocks.GOLD_ORE) || state.is(Blocks.REDSTONE_ORE) || state.is(Blocks.LAPIS_ORE)
- || state.is(Blocks.DIAMOND_ORE) || state.is(Blocks.EMERALD_ORE)) {
- blocks++;
- }
- }
- }
- }
- return blocks;
- }
-
- private static int countLogs(ServerLevel level, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
- int logs = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- BlockState state = level.getBlockState(pos.set(x, y, z));
- if (state.getBlock() instanceof RotatedPillarBlock && state.is(net.minecraft.tags.BlockTags.LOGS)) {
- logs++;
- }
- }
- }
- }
- return logs;
- }
-
- private static int countSaplings(ServerLevel level, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
- int saplings = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- BlockState state = level.getBlockState(pos.set(x, y, z));
- if (state.getBlock() instanceof SaplingBlock) {
- saplings++;
- }
- }
- }
- }
- return saplings;
- }
-
- private static int countBlocks(ServerLevel level, ZoneSelection zone, net.minecraft.world.level.block.Block block) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- int count = 0;
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- if (level.getBlockState(pos.set(x, y, z)).is(block)) {
- count++;
- }
- }
- }
- }
- return count;
- }
-
- private static List<BlockPos> collectPositions(ServerLevel level, ZoneSelection zone, java.util.function.Predicate<BlockState> predicate) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- List<BlockPos> positions = new ArrayList<>();
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- pos.set(x, y, z);
- if (predicate.test(level.getBlockState(pos))) {
- positions.add(pos.immutable());
- }
- }
- }
- }
- return positions;
- }
-
- private static boolean hasCloseAnvilFurnacePair(List<BlockPos> anvils, List<BlockPos> furnaces, double maxDistance) {
- double maxDistanceSqr = maxDistance * maxDistance;
- for (BlockPos anvil : anvils) {
- for (BlockPos furnace : furnaces) {
- if (anvil.distSqr(furnace) <= maxDistanceSqr) {
- return true;
- }
- }
- }
- return false;
- }
-
- private static double distanceToZone(BlockPos anchorPos, ZoneSelection zone) {
- int minX = Math.min(zone.min().getX(), zone.max().getX());
- int minY = Math.min(zone.min().getY(), zone.max().getY());
- int minZ = Math.min(zone.min().getZ(), zone.max().getZ());
- int maxX = Math.max(zone.min().getX(), zone.max().getX());
- int maxY = Math.max(zone.min().getY(), zone.max().getY());
- int maxZ = Math.max(zone.min().getZ(), zone.max().getZ());
-
- int cx = clamp(anchorPos.getX(), minX, maxX);
- int cy = clamp(anchorPos.getY(), minY, maxY);
- int cz = clamp(anchorPos.getZ(), minZ, maxZ);
- return Math.sqrt(anchorPos.distSqr(new BlockPos(cx, cy, cz)));
- }
-
- private static int clamp(int value, int min, int max) {
- return Math.max(min, Math.min(max, value));
- }
-
- private static boolean hasBannerNearAnchor(ServerLevel level, BlockPos anchorPos, int radius) {
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- for (int x = anchorPos.getX() - radius; x <= anchorPos.getX() + radius; x++) {
- for (int y = anchorPos.getY() - radius; y <= anchorPos.getY() + radius; y++) {
- for (int z = anchorPos.getZ() - radius; z <= anchorPos.getZ() + radius; z++) {
- if (level.getBlockState(pos.set(x, y, z)).getBlock() instanceof BannerBlock) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- private static boolean hasEntrance(ZoneSelection interior, ServerLevel level) {
- int minX = Math.min(interior.min().getX(), interior.max().getX());
- int minY = Math.min(interior.min().getY(), interior.max().getY());
- int minZ = Math.min(interior.min().getZ(), interior.max().getZ());
- int maxX = Math.max(interior.min().getX(), interior.max().getX());
- int maxY = Math.max(interior.min().getY(), interior.max().getY());
- int maxZ = Math.max(interior.min().getZ(), interior.max().getZ());
- BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
- BlockPos.MutableBlockPos abovePos = new BlockPos.MutableBlockPos();
- for (int x = minX; x <= maxX; x++) {
- for (int y = minY; y <= maxY; y++) {
- for (int z = minZ; z <= maxZ; z++) {
- boolean boundary = x == minX || x == maxX || z == minZ || z == maxZ;
- if (!boundary) {
- continue;
- }
- pos.set(x, y, z);
- BlockState state = level.getBlockState(pos);
- BlockState above = level.getBlockState(abovePos.setWithOffset(pos, 0, 1, 0));
- if (!state.isAir() || !above.isAir()) {
- continue;
- }
- if (hasOutsideAirAdjacent(pos, level)) {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- private static boolean hasOutsideAirAdjacent(BlockPos pos, ServerLevel level) {
- for (BlockPos adjacent : List.of(pos.north(), pos.south(), pos.east(), pos.west())) {
- if (level.getBlockState(adjacent).isAir()) {
- return true;
- }
- }
- return false;
- }
-
- private static ValidatedBuildingSnapshot buildSnapshot(BuildingValidationRequest request) {
- if (request.zones().isEmpty()) {
- return new ValidatedBuildingSnapshot(request.anchorPos(), new AABB(request.anchorPos()), List.of());
- }
- AABB bounds = request.zones().stream()
- .map(ZoneSelection::toAabb)
- .min(Comparator.comparingDouble(aabb -> aabb.minX + aabb.minY + aabb.minZ))
- .orElse(new AABB(request.anchorPos()));
- for (ZoneSelection zone : request.zones()) {
- bounds = bounds.minmax(zone.toAabb());
- }
- return new ValidatedBuildingSnapshot(request.anchorPos(), bounds, request.zones());
- }
-
- private static boolean zonesOverlapByBlockVolume(ZoneSelection left, ZoneSelection right) {
- return rangesOverlap(
- Math.min(left.min().getX(), left.max().getX()),
- Math.max(left.min().getX(), left.max().getX()),
- Math.min(right.min().getX(), right.max().getX()),
- Math.max(right.min().getX(), right.max().getX()))
- && rangesOverlap(
- Math.min(left.min().getY(), left.max().getY()),
- Math.max(left.min().getY(), left.max().getY()),
- Math.min(right.min().getY(), right.max().getY()),
- Math.max(right.min().getY(), right.max().getY()))
- && rangesOverlap(
- Math.min(left.min().getZ(), left.max().getZ()),
- Math.max(left.min().getZ(), left.max().getZ()),
- Math.min(right.min().getZ(), right.max().getZ()),
- Math.max(right.min().getZ(), right.max().getZ()));
- }
-
- private static boolean rangesOverlap(int leftMin, int leftMax, int rightMin, int rightMax) {
- return Math.max(leftMin, rightMin) <= Math.min(leftMax, rightMax);
- }
-
- private record InteriorStats(int walkableBlocks, double roofCoverage) {
- }
-
- private record RolePair(ZoneRole left, ZoneRole right) {
- }
-}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementBuildingValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementBuildingValidator.java
new file mode 100644
index 00000000..8c1aa8c3
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementBuildingValidator.java
@@ -0,0 +1,145 @@
+package com.talhanation.bannermod.settlement.validation;
+
+import com.talhanation.bannermod.settlement.building.BuildingDefinition;
+import com.talhanation.bannermod.settlement.building.BuildingDefinitionRegistry;
+import com.talhanation.bannermod.settlement.building.BuildingType;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRegistryData;
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.types.BuildingTypeValidatorDispatcher;
+import com.talhanation.bannermod.settlement.validation.types.BuildingValidationContext;
+import com.talhanation.bannermod.settlement.validation.types.BuildingValidationSupport;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.player.Player;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+public class SettlementBuildingValidator implements BuildingValidator {
+ private static final int MAX_ZONE_VOLUME = 262_144;
+ private static final Set<RolePair> PROHIBITED_OVERLAP_ROLE_PAIRS = prohibitedRolePairs();
+
+ private final BuildingDefinitionRegistry definitionRegistry;
+ private final BuildingTypeValidatorDispatcher typeValidatorDispatcher;
+
+ public SettlementBuildingValidator(BuildingDefinitionRegistry definitionRegistry) {
+ this(definitionRegistry, new BuildingTypeValidatorDispatcher());
+ }
+
+ public SettlementBuildingValidator(BuildingDefinitionRegistry definitionRegistry,
+ BuildingTypeValidatorDispatcher typeValidatorDispatcher) {
+ this.definitionRegistry = definitionRegistry;
+ this.typeValidatorDispatcher = typeValidatorDispatcher;
+ }
+
+ @Override
+ public BuildingValidationResult validate(ServerLevel level, Player player, BuildingValidationRequest request) {
+ if (level == null || request == null) {
+ return BuildingValidationResult.blockingFailure(null, "invalid_request", "Validation request is missing.");
+ }
+ Optional<BuildingDefinition> optionalDefinition = this.definitionRegistry.get(request.type());
+ if (optionalDefinition.isEmpty()) {
+ return BuildingValidationResult.blockingFailure(request.type(), "unknown_building_type", "No building definition is registered.");
+ }
+
+ List<ValidationIssue> blocking = new ArrayList<>();
+ List<ValidationIssue> warnings = new ArrayList<>();
+ validateSelection(request, optionalDefinition.get(), blocking);
+ if (request.enforceOverlapChecks()) {
+ validateOverlap(level, request, blocking);
+ }
+ if (!blocking.isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, blocking, warnings, null);
+ }
+
+ BuildingValidationContext context = new BuildingValidationContext(
+ level, player, request, BuildingValidationSupport.toRoleMap(request.zones()), warnings, blocking);
+ return this.typeValidatorDispatcher.validate(context, missing -> BuildingValidationResult.blockingFailure(
+ missing.request().type(), "validator_not_implemented", "Validator pipeline for this building type is not implemented yet."));
+ }
+
+ @Override
+ public BuildingValidationResult revalidate(ServerLevel level, ValidatedBuildingRecord building) {
+ if (level == null || building == null) {
+ return BuildingValidationResult.blockingFailure(null, "invalid_revalidation_request", "Revalidation request is missing.");
+ }
+ BuildingValidationRequest request = new BuildingValidationRequest(
+ building.settlementId(), building.type(), building.anchorPos(), building.zones(), false);
+ BuildingValidationResult result = validate(level, null, request);
+ if (result.valid() || building.type() != BuildingType.HOUSE || building.zones().isEmpty()) {
+ return result;
+ }
+
+ BuildingValidationRequest recoveredHouseRequest = BuildingValidationSupport.tryRecoverHouseRequest(level, building);
+ if (recoveredHouseRequest == null) {
+ return result;
+ }
+ BuildingValidationResult recovered = validate(level, null, recoveredHouseRequest);
+ return recovered.valid() ? recovered : result;
+ }
+
+ private void validateSelection(BuildingValidationRequest request,
+ BuildingDefinition definition,
+ List<ValidationIssue> blocking) {
+ if (request.zones().isEmpty()) {
+ blocking.add(new ValidationIssue("selection_missing", "No zones selected.", ValidationSeverity.BLOCKING));
+ return;
+ }
+ for (ZoneRole requiredRole : definition.requiredZones()) {
+ if (!BuildingValidationSupport.toRoleMap(request.zones()).containsKey(requiredRole)) {
+ blocking.add(new ValidationIssue("required_zone_missing", "Required zone is missing: " + requiredRole.name(), ValidationSeverity.BLOCKING));
+ }
+ }
+ for (ZoneSelection zone : request.zones()) {
+ if (zone.volume() <= 0) {
+ blocking.add(new ValidationIssue("invalid_zone_volume", "Zone has invalid volume.", ValidationSeverity.BLOCKING));
+ } else if (zone.volume() > MAX_ZONE_VOLUME) {
+ blocking.add(new ValidationIssue("zone_too_large", "Zone exceeds max MVP volume: " + zone.volume(), ValidationSeverity.BLOCKING));
+ }
+ }
+ if (!BuildingValidationSupport.isAnchorCovered(request.anchorPos(), request.zones())) {
+ blocking.add(new ValidationIssue("anchor_outside_selection", "Anchor must be inside at least one selected zone.", ValidationSeverity.BLOCKING));
+ }
+ }
+
+ private void validateOverlap(ServerLevel level, BuildingValidationRequest request, List<ValidationIssue> blocking) {
+ ValidatedBuildingSnapshot snapshot = BuildingValidationSupport.buildSnapshot(request);
+ List<ValidatedBuildingRecord> intersecting = ValidatedBuildingRegistryData.get(level).findIntersecting(snapshot.bounds());
+ for (ValidatedBuildingRecord existing : intersecting) {
+ if (!existing.settlementId().equals(request.settlementId()) || existing.type() == request.type()) {
+ continue;
+ }
+ for (ZoneSelection incomingZone : request.zones()) {
+ for (ZoneSelection existingZone : existing.zones()) {
+ if (incomingZone == null || existingZone == null
+ || !PROHIBITED_OVERLAP_ROLE_PAIRS.contains(new RolePair(incomingZone.role(), existingZone.role()))
+ || !BuildingValidationSupport.zonesOverlapByBlockVolume(incomingZone, existingZone)) {
+ continue;
+ }
+ blocking.add(new ValidationIssue("overlap_conflict", "Building overlaps conflicting zones (" + incomingZone.role().name()
+ + " vs " + existingZone.role().name() + ") with existing " + existing.type().name() + ".", ValidationSeverity.BLOCKING));
+ return;
+ }
+ }
+ }
+ }
+
+ private static Set<RolePair> prohibitedRolePairs() {
+ Set<RolePair> pairs = new HashSet<>();
+ List<ZoneRole> primaryRoles = Arrays.asList(ZoneRole.INTERIOR, ZoneRole.SLEEPING, ZoneRole.WORK_ZONE);
+ for (ZoneRole left : primaryRoles) {
+ for (ZoneRole right : primaryRoles) {
+ pairs.add(new RolePair(left, right));
+ }
+ }
+ return Set.copyOf(pairs);
+ }
+
+ private record RolePair(ZoneRole left, ZoneRole right) {
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementSurveyorService.java b/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementSurveyorService.java
index fba5dbda..63cb6116 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementSurveyorService.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/SettlementSurveyorService.java
@@ -52,7 +52,7 @@ public static void validateCurrentSession(ServerPlayer player, ValidationSession
}
UUID settlementId = settlementAtAnchor == null ? new UUID(0L, 0L) : settlementAtAnchor.settlementId();
BuildingValidationRequest request = new BuildingValidationRequest(settlementId, type, session.anchorPos(), session.selections());
- BuildingValidationResult result = new DefaultBuildingValidator(new BuildingDefinitionRegistry()).validate(level, player, request);
+ BuildingValidationResult result = new SettlementBuildingValidator(new BuildingDefinitionRegistry()).validate(level, player, request);
SurveyorFeedbackFormatter.sendValidationResult(player, result);
if (!result.valid()) return;
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/ArchitectWorkshopValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/ArchitectWorkshopValidator.java
new file mode 100644
index 00000000..2e9ee2af
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/ArchitectWorkshopValidator.java
@@ -0,0 +1,38 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+import net.minecraft.world.level.block.Blocks;
+
+public final class ArchitectWorkshopValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection interior = context.zonesByRole().get(ZoneRole.INTERIOR);
+ ZoneSelection workZone = context.zonesByRole().get(ZoneRole.WORK_ZONE);
+ if (interior == null || workZone == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "architect_zones_missing", "Architect workshop requires INTERIOR and WORK_ZONE zones.");
+ }
+ BuildingValidationSupport.InteriorStats interiorStats = BuildingValidationSupport.scanInterior(context.level(), interior);
+ if (interiorStats.walkableBlocks() < 16) {
+ context.blocking().add(new ValidationIssue("architect_walkable_too_small", "Architect workshop requires at least 16 walkable interior blocks.", ValidationSeverity.BLOCKING));
+ }
+ if (interiorStats.roofCoverage() < 0.70D) {
+ context.blocking().add(new ValidationIssue("architect_roof_too_open", "Architect workshop requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
+ }
+ int draftingTables = BuildingValidationSupport.countBlocks(context.level(), workZone, Blocks.CRAFTING_TABLE);
+ if (draftingTables < 1) {
+ context.blocking().add(new ValidationIssue("architect_table_missing", "Architect workshop requires at least one drafting table (crafting table placeholder).", ValidationSeverity.BLOCKING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+ int capacity = Math.min(draftingTables, Math.max(1, interiorStats.walkableBlocks() / 24));
+ int qualityScore = Math.min(100, (int) Math.round(interiorStats.roofCoverage() * 100.0D));
+ return BuildingValidationResult.success(request.type(), capacity, qualityScore, context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/BarracksValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/BarracksValidator.java
new file mode 100644
index 00000000..5f736096
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/BarracksValidator.java
@@ -0,0 +1,49 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class BarracksValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection interior = context.zonesByRole().get(ZoneRole.INTERIOR);
+ ZoneSelection sleeping = context.zonesByRole().get(ZoneRole.SLEEPING);
+ ZoneSelection storage = context.zonesByRole().get(ZoneRole.STORAGE);
+ if (interior == null || sleeping == null || storage == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "barracks_zones_missing", "Barracks requires INTERIOR, SLEEPING, and STORAGE zones.");
+ }
+
+ BuildingValidationSupport.InteriorStats interiorStats = BuildingValidationSupport.scanInterior(context.level(), interior);
+ if (interiorStats.walkableBlocks() < 16) {
+ context.blocking().add(new ValidationIssue("barracks_walkable_too_small", "Barracks requires at least 16 walkable interior blocks.", ValidationSeverity.BLOCKING));
+ }
+ if (interiorStats.roofCoverage() < 0.70D) {
+ context.blocking().add(new ValidationIssue("barracks_roof_too_open", "Barracks requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
+ }
+ int beds = BuildingValidationSupport.countBeds(context.level(), sleeping);
+ if (beds < 2) {
+ beds = Math.max(beds, BuildingValidationSupport.countBedsNearZone(context.level(), sleeping, 1));
+ }
+ if (beds < 2) {
+ context.blocking().add(new ValidationIssue("barracks_beds_missing", "Barracks requires at least two beds or bunks in the sleeping zone.", ValidationSeverity.BLOCKING));
+ }
+ if (BuildingValidationSupport.countContainers(context.level(), storage) < 1) {
+ context.blocking().add(new ValidationIssue("barracks_storage_missing", "Barracks requires at least one chest or barrel in the storage zone.", ValidationSeverity.BLOCKING));
+ }
+ if (!BuildingValidationSupport.hasEntrance(interior, context.level())) {
+ context.warnings().add(new ValidationIssue("barracks_entrance_unclear", "Barracks entrance is unclear for current selection.", ValidationSeverity.WARNING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+
+ int capacity = BuildingValidationSupport.clamp(Math.max(1, beds), 1, 4);
+ int qualityScore = Math.min(100, (int) Math.round(interiorStats.roofCoverage() * 100.0D));
+ return BuildingValidationResult.success(request.type(), capacity, qualityScore, context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcher.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcher.java
index 380756e5..12ccf2bf 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcher.java
@@ -13,6 +13,15 @@ public final class BuildingTypeValidatorDispatcher {
private final EnumMap<BuildingType, BuildingTypeValidator> validators = new EnumMap<>(BuildingType.class);
public BuildingTypeValidatorDispatcher() {
+ register(BuildingType.STARTER_FORT, new StarterFortValidator());
+ register(BuildingType.HOUSE, new HouseValidator());
+ register(BuildingType.FARM, new FarmValidator());
+ register(BuildingType.MINE, new MineValidator());
+ register(BuildingType.LUMBER_CAMP, new LumberCampValidator());
+ register(BuildingType.SMITHY, new SmithyValidator());
+ register(BuildingType.STORAGE, new StorageValidator());
+ register(BuildingType.ARCHITECT_WORKSHOP, new ArchitectWorkshopValidator());
+ register(BuildingType.BARRACKS, new BarracksValidator());
}
public BuildingTypeValidatorDispatcher(Map<BuildingType, BuildingTypeValidator> validators) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingValidationSupport.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingValidationSupport.java
new file mode 100644
index 00000000..9cf82947
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/BuildingValidationSupport.java
@@ -0,0 +1,315 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.BuildingType;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.ValidatedBuildingSnapshot;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.BannerBlock;
+import net.minecraft.world.level.block.BedBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.CropBlock;
+import net.minecraft.world.level.block.RotatedPillarBlock;
+import net.minecraft.world.level.block.SaplingBlock;
+import net.minecraft.world.level.block.entity.BarrelBlockEntity;
+import net.minecraft.world.level.block.entity.ChestBlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.phys.AABB;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.EnumMap;
+import java.util.List;
+import java.util.function.Predicate;
+
+public final class BuildingValidationSupport {
+ private BuildingValidationSupport() {
+ }
+
+ public static EnumMap<ZoneRole, ZoneSelection> toRoleMap(List<ZoneSelection> zones) {
+ EnumMap<ZoneRole, ZoneSelection> map = new EnumMap<>(ZoneRole.class);
+ for (ZoneSelection zone : zones) {
+ if (zone != null) {
+ map.putIfAbsent(zone.role(), zone);
+ }
+ }
+ return map;
+ }
+
+ public static boolean isAnchorCovered(BlockPos anchor, List<ZoneSelection> zones) {
+ if (anchor == null) {
+ return false;
+ }
+ for (ZoneSelection zone : zones) {
+ if (zone != null && zone.contains(anchor)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static InteriorStats scanInterior(ServerLevel level, ZoneSelection interior) {
+ int walkable = 0;
+ int roofed = 0;
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ BlockPos.MutableBlockPos offsetPos = new BlockPos.MutableBlockPos();
+ for (int x = minX(interior); x <= maxX(interior); x++) {
+ for (int y = minY(interior); y <= maxY(interior); y++) {
+ for (int z = minZ(interior); z <= maxZ(interior); z++) {
+ pos.set(x, y, z);
+ BlockState state = level.getBlockState(pos);
+ BlockState above = level.getBlockState(offsetPos.setWithOffset(pos, 0, 1, 0));
+ BlockState below = level.getBlockState(offsetPos.setWithOffset(pos, 0, -1, 0));
+ if (state.isAir() && above.isAir() && below.isSolid()) {
+ walkable++;
+ roofed += hasRoofCover(level, pos) ? 1 : 0;
+ }
+ }
+ }
+ }
+ return new InteriorStats(walkable, walkable == 0 ? 0.0D : (double) roofed / (double) walkable);
+ }
+
+ public static int countBeds(ServerLevel level, ZoneSelection zone) {
+ return countMatchingBlocks(level, zone, state -> state.getBlock() instanceof BedBlock);
+ }
+
+ public static int countBedsNearZone(ServerLevel level, ZoneSelection zone, int expansion) {
+ return countMatchingBlocks(level, zone, expansion, state -> state.getBlock() instanceof BedBlock);
+ }
+
+ public static BuildingValidationRequest tryRecoverHouseRequest(ServerLevel level, ValidatedBuildingRecord building) {
+ BlockPos bedPos = findNearestBed(level, building.anchorPos(), 12);
+ if (bedPos == null) {
+ return null;
+ }
+ ZoneSelection interior = new ZoneSelection(ZoneRole.INTERIOR, bedPos.offset(-1, 0, -1), bedPos.offset(2, 1, 2), bedPos);
+ ZoneSelection sleeping = new ZoneSelection(ZoneRole.SLEEPING, bedPos, bedPos, bedPos);
+ return new BuildingValidationRequest(building.settlementId(), BuildingType.HOUSE, bedPos, List.of(interior, sleeping), false);
+ }
+
+ public static BlockPos findNearestBed(ServerLevel level, BlockPos origin, int radius) {
+ BlockPos nearest = null;
+ double bestDistance = Double.MAX_VALUE;
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ for (int x = origin.getX() - radius; x <= origin.getX() + radius; x++) {
+ for (int y = origin.getY() - radius; y <= origin.getY() + radius; y++) {
+ for (int z = origin.getZ() - radius; z <= origin.getZ() + radius; z++) {
+ pos.set(x, y, z);
+ if (level.getBlockState(pos).getBlock() instanceof BedBlock && origin.distSqr(pos) < bestDistance) {
+ bestDistance = origin.distSqr(pos);
+ nearest = pos.immutable();
+ }
+ }
+ }
+ }
+ return nearest;
+ }
+
+ public static int countFarmlandBlocks(ServerLevel level, ZoneSelection zone) {
+ BlockPos.MutableBlockPos abovePos = new BlockPos.MutableBlockPos();
+ return countMatchingBlocks(level, zone, (pos, state) -> state.is(Blocks.FARMLAND)
+ || level.getBlockState(abovePos.setWithOffset(pos, 0, 1, 0)).getBlock() instanceof CropBlock);
+ }
+
+ public static int countContainers(ServerLevel level, ZoneSelection zone) {
+ int containers = 0;
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ for (int x = minX(zone); x <= maxX(zone); x++) {
+ for (int y = minY(zone); y <= maxY(zone); y++) {
+ for (int z = minZ(zone); z <= maxZ(zone); z++) {
+ Object blockEntity = level.getBlockEntity(pos.set(x, y, z));
+ containers += blockEntity instanceof ChestBlockEntity || blockEntity instanceof BarrelBlockEntity ? 1 : 0;
+ }
+ }
+ }
+ return containers;
+ }
+
+ public static int countMineFaceBlocks(ServerLevel level, ZoneSelection zone) {
+ return countMatchingBlocks(level, zone, state -> state.is(Blocks.STONE) || state.is(Blocks.DEEPSLATE) || state.is(Blocks.COBBLESTONE)
+ || state.is(Blocks.COAL_ORE) || state.is(Blocks.IRON_ORE) || state.is(Blocks.COPPER_ORE)
+ || state.is(Blocks.GOLD_ORE) || state.is(Blocks.REDSTONE_ORE) || state.is(Blocks.LAPIS_ORE)
+ || state.is(Blocks.DIAMOND_ORE) || state.is(Blocks.EMERALD_ORE));
+ }
+
+ public static int countLogs(ServerLevel level, ZoneSelection zone) {
+ return countMatchingBlocks(level, zone, state -> state.getBlock() instanceof RotatedPillarBlock && state.is(net.minecraft.tags.BlockTags.LOGS));
+ }
+
+ public static int countSaplings(ServerLevel level, ZoneSelection zone) {
+ return countMatchingBlocks(level, zone, state -> state.getBlock() instanceof SaplingBlock);
+ }
+
+ public static int countBlocks(ServerLevel level, ZoneSelection zone, Block block) {
+ return countMatchingBlocks(level, zone, state -> state.is(block));
+ }
+
+ public static List<BlockPos> collectPositions(ServerLevel level, ZoneSelection zone, Predicate<BlockState> predicate) {
+ List<BlockPos> positions = new ArrayList<>();
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ forEach(zone, pos, current -> {
+ if (predicate.test(level.getBlockState(current))) {
+ positions.add(current.immutable());
+ }
+ });
+ return positions;
+ }
+
+ public static boolean hasClosePair(List<BlockPos> leftPositions, List<BlockPos> rightPositions, double maxDistance) {
+ double maxDistanceSqr = maxDistance * maxDistance;
+ for (BlockPos left : leftPositions) {
+ for (BlockPos right : rightPositions) {
+ if (left.distSqr(right) <= maxDistanceSqr) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ public static double distanceToZone(BlockPos anchorPos, ZoneSelection zone) {
+ int cx = clamp(anchorPos.getX(), minX(zone), maxX(zone));
+ int cy = clamp(anchorPos.getY(), minY(zone), maxY(zone));
+ int cz = clamp(anchorPos.getZ(), minZ(zone), maxZ(zone));
+ return Math.sqrt(anchorPos.distSqr(new BlockPos(cx, cy, cz)));
+ }
+
+ public static int clamp(int value, int min, int max) {
+ return Math.max(min, Math.min(max, value));
+ }
+
+ public static boolean hasBannerNearAnchor(ServerLevel level, BlockPos anchorPos, int radius) {
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ for (int x = anchorPos.getX() - radius; x <= anchorPos.getX() + radius; x++) {
+ for (int y = anchorPos.getY() - radius; y <= anchorPos.getY() + radius; y++) {
+ for (int z = anchorPos.getZ() - radius; z <= anchorPos.getZ() + radius; z++) {
+ if (level.getBlockState(pos.set(x, y, z)).getBlock() instanceof BannerBlock) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ public static boolean hasEntrance(ZoneSelection interior, ServerLevel level) {
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ BlockPos.MutableBlockPos abovePos = new BlockPos.MutableBlockPos();
+ for (int x = minX(interior); x <= maxX(interior); x++) {
+ for (int y = minY(interior); y <= maxY(interior); y++) {
+ for (int z = minZ(interior); z <= maxZ(interior); z++) {
+ if (x != minX(interior) && x != maxX(interior) && z != minZ(interior) && z != maxZ(interior)) {
+ continue;
+ }
+ pos.set(x, y, z);
+ if (level.getBlockState(pos).isAir() && level.getBlockState(abovePos.setWithOffset(pos, 0, 1, 0)).isAir()
+ && hasOutsideAirAdjacent(pos, level)) {
+ return true;
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+ public static ValidatedBuildingSnapshot buildSnapshot(BuildingValidationRequest request) {
+ if (request.zones().isEmpty()) {
+ return new ValidatedBuildingSnapshot(request.anchorPos(), new AABB(request.anchorPos()), List.of());
+ }
+ AABB bounds = request.zones().stream().map(ZoneSelection::toAabb)
+ .min(Comparator.comparingDouble(aabb -> aabb.minX + aabb.minY + aabb.minZ)).orElse(new AABB(request.anchorPos()));
+ for (ZoneSelection zone : request.zones()) {
+ bounds = bounds.minmax(zone.toAabb());
+ }
+ return new ValidatedBuildingSnapshot(request.anchorPos(), bounds, request.zones());
+ }
+
+ public static boolean zonesOverlapByBlockVolume(ZoneSelection left, ZoneSelection right) {
+ return rangesOverlap(minX(left), maxX(left), minX(right), maxX(right))
+ && rangesOverlap(minY(left), maxY(left), minY(right), maxY(right))
+ && rangesOverlap(minZ(left), maxZ(left), minZ(right), maxZ(right));
+ }
+
+ private static int countMatchingBlocks(ServerLevel level, ZoneSelection zone, Predicate<BlockState> predicate) {
+ return countMatchingBlocks(level, zone, 0, predicate);
+ }
+
+ private static int countMatchingBlocks(ServerLevel level, ZoneSelection zone, int expansion, Predicate<BlockState> predicate) {
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ int count = 0;
+ for (int x = minX(zone) - expansion; x <= maxX(zone) + expansion; x++) {
+ for (int y = minY(zone) - expansion; y <= maxY(zone) + expansion; y++) {
+ for (int z = minZ(zone) - expansion; z <= maxZ(zone) + expansion; z++) {
+ count += predicate.test(level.getBlockState(pos.set(x, y, z))) ? 1 : 0;
+ }
+ }
+ }
+ return count;
+ }
+
+ private static int countMatchingBlocks(ServerLevel level, ZoneSelection zone, PositionedBlockPredicate predicate) {
+ BlockPos.MutableBlockPos pos = new BlockPos.MutableBlockPos();
+ int count = 0;
+ for (int x = minX(zone); x <= maxX(zone); x++) {
+ for (int y = minY(zone); y <= maxY(zone); y++) {
+ for (int z = minZ(zone); z <= maxZ(zone); z++) {
+ count += predicate.test(pos.set(x, y, z), level.getBlockState(pos)) ? 1 : 0;
+ }
+ }
+ }
+ return count;
+ }
+
+ private static void forEach(ZoneSelection zone, BlockPos.MutableBlockPos pos, java.util.function.Consumer<BlockPos> consumer) {
+ for (int x = minX(zone); x <= maxX(zone); x++) {
+ for (int y = minY(zone); y <= maxY(zone); y++) {
+ for (int z = minZ(zone); z <= maxZ(zone); z++) {
+ consumer.accept(pos.set(x, y, z));
+ }
+ }
+ }
+ }
+
+ private static boolean hasRoofCover(ServerLevel level, BlockPos pos) {
+ BlockPos.MutableBlockPos roofPos = new BlockPos.MutableBlockPos();
+ int maxY = Math.min(level.getMaxBuildHeight() - 1, pos.getY() + 8);
+ for (int y = pos.getY() + 2; y <= maxY; y++) {
+ if (!level.getBlockState(roofPos.set(pos.getX(), y, pos.getZ())).isAir()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean hasOutsideAirAdjacent(BlockPos pos, ServerLevel level) {
+ for (BlockPos adjacent : List.of(pos.north(), pos.south(), pos.east(), pos.west())) {
+ if (level.getBlockState(adjacent).isAir()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean rangesOverlap(int leftMin, int leftMax, int rightMin, int rightMax) {
+ return Math.max(leftMin, rightMin) <= Math.min(leftMax, rightMax);
+ }
+
+ private static int minX(ZoneSelection zone) { return Math.min(zone.min().getX(), zone.max().getX()); }
+ private static int minY(ZoneSelection zone) { return Math.min(zone.min().getY(), zone.max().getY()); }
+ private static int minZ(ZoneSelection zone) { return Math.min(zone.min().getZ(), zone.max().getZ()); }
+ private static int maxX(ZoneSelection zone) { return Math.max(zone.min().getX(), zone.max().getX()); }
+ private static int maxY(ZoneSelection zone) { return Math.max(zone.min().getY(), zone.max().getY()); }
+ private static int maxZ(ZoneSelection zone) { return Math.max(zone.min().getZ(), zone.max().getZ()); }
+
+ public record InteriorStats(int walkableBlocks, double roofCoverage) {
+ }
+
+ private interface PositionedBlockPredicate {
+ boolean test(BlockPos pos, BlockState state);
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/FarmValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/FarmValidator.java
new file mode 100644
index 00000000..51e0e15c
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/FarmValidator.java
@@ -0,0 +1,31 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class FarmValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection workZone = context.zonesByRole().get(ZoneRole.WORK_ZONE);
+ if (workZone == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "farm_work_zone_missing", "Farm requires a WORK_ZONE.");
+ }
+ if (BuildingValidationSupport.distanceToZone(request.anchorPos(), workZone) > 24.0D) {
+ context.blocking().add(new ValidationIssue("farm_anchor_too_far", "Farm anchor must be within 24 blocks of work zone.", ValidationSeverity.BLOCKING));
+ }
+ int farmlandBlocks = BuildingValidationSupport.countFarmlandBlocks(context.level(), workZone);
+ if (farmlandBlocks < 24) {
+ context.blocking().add(new ValidationIssue("farm_farmland_too_small", "Farm requires at least 24 farmland/crop-capable blocks.", ValidationSeverity.BLOCKING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+ int capacity = BuildingValidationSupport.clamp(farmlandBlocks / 48, 1, 4);
+ return BuildingValidationResult.success(request.type(), capacity, Math.min(100, farmlandBlocks), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/HouseValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/HouseValidator.java
new file mode 100644
index 00000000..38ac2fee
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/HouseValidator.java
@@ -0,0 +1,57 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class HouseValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection interior = context.zonesByRole().get(ZoneRole.INTERIOR);
+ ZoneSelection sleeping = context.zonesByRole().get(ZoneRole.SLEEPING);
+ if (interior == null || sleeping == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "house_zones_missing", "House requires INTERIOR and SLEEPING zones.");
+ }
+
+ BuildingValidationSupport.InteriorStats stats = BuildingValidationSupport.scanInterior(context.level(), interior);
+ int validBeds = BuildingValidationSupport.countBeds(context.level(), sleeping);
+ if (stats.walkableBlocks() < 8) {
+ context.blocking().add(new ValidationIssue("house_walkable_too_small", "House requires at least 8 walkable interior blocks.", ValidationSeverity.BLOCKING));
+ }
+ if (stats.roofCoverage() < 0.70D) {
+ context.blocking().add(new ValidationIssue("house_roof_too_open", "House requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
+ }
+ if (validBeds < 1) {
+ validBeds = BuildingValidationSupport.countBedsNearZone(context.level(), sleeping, 1);
+ }
+ if (validBeds < 1) {
+ validBeds = BuildingValidationSupport.countBeds(context.level(), interior);
+ }
+ if (validBeds < 1) {
+ validBeds = BuildingValidationSupport.countBedsNearZone(context.level(), interior, 1);
+ }
+ if (validBeds < 1 && BuildingValidationSupport.findNearestBed(context.level(), request.anchorPos(), 12) != null) {
+ validBeds = 1;
+ }
+ if (validBeds < 1) {
+ context.blocking().add(new ValidationIssue("house_bed_missing", "House requires at least one bed in sleeping zone.", ValidationSeverity.BLOCKING));
+ }
+ if (!BuildingValidationSupport.hasEntrance(interior, context.level())) {
+ context.warnings().add(new ValidationIssue("house_entrance_missing", "House entrance is unclear for current selection.", ValidationSeverity.WARNING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+
+ int capacity = Math.min(validBeds, stats.walkableBlocks() / 8);
+ if (capacity < 1) {
+ capacity = 1;
+ context.warnings().add(new ValidationIssue("house_capacity_clamped", "House passed with minimum capacity due to tight interior space.", ValidationSeverity.WARNING));
+ }
+ return BuildingValidationResult.success(request.type(), capacity, Math.min(100, (int) Math.round(stats.roofCoverage() * 100.0D)), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/LumberCampValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/LumberCampValidator.java
new file mode 100644
index 00000000..e795f670
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/LumberCampValidator.java
@@ -0,0 +1,32 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class LumberCampValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection workZone = context.zonesByRole().get(ZoneRole.WORK_ZONE);
+ if (workZone == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "lumber_work_zone_missing", "Lumber camp requires a WORK_ZONE.");
+ }
+ if (BuildingValidationSupport.distanceToZone(request.anchorPos(), workZone) > 32.0D) {
+ context.blocking().add(new ValidationIssue("lumber_anchor_too_far", "Lumber camp anchor must be within 32 blocks of work zone.", ValidationSeverity.BLOCKING));
+ }
+ int productivity = BuildingValidationSupport.countLogs(context.level(), workZone)
+ + (BuildingValidationSupport.countSaplings(context.level(), workZone) / 2);
+ if (productivity < 12) {
+ context.blocking().add(new ValidationIssue("lumber_resources_too_small", "Lumber camp requires enough logs/saplings in zone.", ValidationSeverity.BLOCKING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+ int capacity = BuildingValidationSupport.clamp(productivity / 12, 1, 3);
+ return BuildingValidationResult.success(request.type(), capacity, Math.min(100, productivity * 2), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/MineValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/MineValidator.java
new file mode 100644
index 00000000..ce136c96
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/MineValidator.java
@@ -0,0 +1,34 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class MineValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection workZone = context.zonesByRole().get(ZoneRole.WORK_ZONE);
+ if (workZone == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "mine_work_zone_missing", "Mine requires a WORK_ZONE.");
+ }
+ if (BuildingValidationSupport.distanceToZone(request.anchorPos(), workZone) > 32.0D) {
+ context.blocking().add(new ValidationIssue("mine_anchor_too_far", "Mine anchor must be within 32 blocks of work zone.", ValidationSeverity.BLOCKING));
+ }
+ if (context.level().canSeeSky(request.anchorPos().above())) {
+ context.warnings().add(new ValidationIssue("mine_anchor_unsheltered", "Mine anchor is exposed to sky. A covered shed is recommended.", ValidationSeverity.WARNING));
+ }
+ int validMineFaceBlocks = BuildingValidationSupport.countMineFaceBlocks(context.level(), workZone);
+ if (validMineFaceBlocks < 24) {
+ context.blocking().add(new ValidationIssue("mine_face_too_small", "Mine requires at least 24 exposed stone/ore/deepslate blocks.", ValidationSeverity.BLOCKING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+ int capacity = BuildingValidationSupport.clamp(1 + (validMineFaceBlocks / 64), 1, 4);
+ return BuildingValidationResult.success(request.type(), capacity, Math.min(100, validMineFaceBlocks), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/SmithyValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/SmithyValidator.java
new file mode 100644
index 00000000..9b38b368
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/SmithyValidator.java
@@ -0,0 +1,52 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.AnvilBlock;
+import net.minecraft.world.level.block.BlastFurnaceBlock;
+import net.minecraft.world.level.block.FurnaceBlock;
+
+import java.util.List;
+
+public final class SmithyValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection interior = context.zonesByRole().get(ZoneRole.INTERIOR);
+ ZoneSelection workZone = context.zonesByRole().get(ZoneRole.WORK_ZONE);
+ if (interior == null || workZone == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "smithy_zones_missing", "Smithy requires INTERIOR and WORK_ZONE zones.");
+ }
+
+ BuildingValidationSupport.InteriorStats interiorStats = BuildingValidationSupport.scanInterior(context.level(), interior);
+ if (interiorStats.roofCoverage() < 0.70D) {
+ context.blocking().add(new ValidationIssue("smithy_roof_too_open", "Smithy requires at least 70% roof coverage.", ValidationSeverity.BLOCKING));
+ }
+ List<BlockPos> anvilPositions = BuildingValidationSupport.collectPositions(context.level(), workZone, state -> state.getBlock() instanceof AnvilBlock);
+ List<BlockPos> furnacePositions = BuildingValidationSupport.collectPositions(context.level(), workZone, state -> state.getBlock() instanceof FurnaceBlock || state.getBlock() instanceof BlastFurnaceBlock);
+ if (anvilPositions.isEmpty()) {
+ context.blocking().add(new ValidationIssue("smithy_anvil_missing", "Smithy requires at least one anvil in work zone.", ValidationSeverity.BLOCKING));
+ }
+ if (furnacePositions.isEmpty()) {
+ context.blocking().add(new ValidationIssue("smithy_furnace_missing", "Smithy requires at least one furnace or blast furnace in work zone.", ValidationSeverity.BLOCKING));
+ }
+ if (!anvilPositions.isEmpty() && !furnacePositions.isEmpty() && !BuildingValidationSupport.hasClosePair(anvilPositions, furnacePositions, 4.0D)) {
+ context.blocking().add(new ValidationIssue("smithy_anchor_set_too_far", "Anvil must be within 4 blocks of a furnace or blast furnace.", ValidationSeverity.BLOCKING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+ int anchorSets = Math.min(anvilPositions.size(), furnacePositions.size());
+ int capacity = Math.min(Math.min(anchorSets, interiorStats.walkableBlocks() / 16), 2);
+ if (capacity < 1) {
+ capacity = 1;
+ context.warnings().add(new ValidationIssue("smithy_capacity_clamped", "Smithy passed with minimum capacity due to limited interior space.", ValidationSeverity.WARNING));
+ }
+ return BuildingValidationResult.success(request.type(), capacity, Math.min(100, (int) Math.round(interiorStats.roofCoverage() * 100.0D)), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/StarterFortValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/StarterFortValidator.java
new file mode 100644
index 00000000..9f933818
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/StarterFortValidator.java
@@ -0,0 +1,45 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.config.WorkersServerConfig;
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class StarterFortValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection interior = context.zonesByRole().get(ZoneRole.INTERIOR);
+ if (interior == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "interior_missing", "Fort interior zone is required.");
+ }
+ ZoneSelection authorityPoint = context.zonesByRole().get(ZoneRole.AUTHORITY_POINT);
+ if (authorityPoint == null || !authorityPoint.contains(request.anchorPos())) {
+ context.warnings().add(new ValidationIssue("fort_authority_unclear", "Fort authority point is missing or does not include anchor.", ValidationSeverity.WARNING));
+ }
+ int bannerRadius = WorkersServerConfig.settlementFortBannerMaxDistance();
+ if (!BuildingValidationSupport.hasBannerNearAnchor(context.level(), request.anchorPos(), bannerRadius)) {
+ context.warnings().add(new ValidationIssue("banner_missing", "No banner found within " + bannerRadius + " blocks of fort anchor.", ValidationSeverity.WARNING));
+ }
+
+ BuildingValidationSupport.InteriorStats stats = BuildingValidationSupport.scanInterior(context.level(), interior);
+ if (stats.walkableBlocks() < 64) {
+ context.blocking().add(new ValidationIssue("fort_walkable_too_small", "Fort interior needs at least 64 walkable blocks around the courtyard and wings.", ValidationSeverity.BLOCKING));
+ }
+ if (stats.roofCoverage() < 0.60D) {
+ context.warnings().add(new ValidationIssue("fort_roof_too_open", "Fort roof coverage is low. A more sheltered interior is recommended.", ValidationSeverity.WARNING));
+ }
+ if (!BuildingValidationSupport.hasEntrance(interior, context.level())) {
+ context.warnings().add(new ValidationIssue("fort_entrance_unclear", "Fort entrance is unclear for current selection; manual review recommended.", ValidationSeverity.WARNING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+
+ int qualityScore = Math.min(100, (int) Math.round((stats.roofCoverage() * 0.70D + Math.min(1.0D, stats.walkableBlocks() / 128.0D) * 0.30D) * 100.0D));
+ return BuildingValidationResult.success(request.type(), 4, qualityScore, context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/validation/types/StorageValidator.java b/src/main/java/com/talhanation/bannermod/settlement/validation/types/StorageValidator.java
new file mode 100644
index 00000000..219f3b7a
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/validation/types/StorageValidator.java
@@ -0,0 +1,27 @@
+package com.talhanation.bannermod.settlement.validation.types;
+
+import com.talhanation.bannermod.settlement.building.ZoneRole;
+import com.talhanation.bannermod.settlement.building.ZoneSelection;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationRequest;
+import com.talhanation.bannermod.settlement.validation.BuildingValidationResult;
+import com.talhanation.bannermod.settlement.validation.ValidationIssue;
+import com.talhanation.bannermod.settlement.validation.ValidationSeverity;
+
+public final class StorageValidator implements BuildingTypeValidator {
+ @Override
+ public BuildingValidationResult validate(BuildingValidationContext context) {
+ BuildingValidationRequest request = context.request();
+ ZoneSelection storageZone = context.zonesByRole().get(ZoneRole.STORAGE);
+ if (storageZone == null) {
+ return BuildingValidationResult.blockingFailure(request.type(), "storage_zone_missing", "Storage requires a STORAGE zone.");
+ }
+ int containerCount = BuildingValidationSupport.countContainers(context.level(), storageZone);
+ if (containerCount < 1) {
+ context.blocking().add(new ValidationIssue("storage_containers_missing", "Storage requires at least one container (chest/barrel).", ValidationSeverity.BLOCKING));
+ }
+ if (!context.blocking().isEmpty()) {
+ return new BuildingValidationResult(false, request.type(), 0, 0, context.blocking(), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+ return BuildingValidationResult.success(request.type(), 0, Math.min(100, containerCount * 10), context.warnings(), BuildingValidationSupport.buildSnapshot(request));
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublishContext.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublishContext.java
index a25a91b7..d9e157cb 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublishContext.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublishContext.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.workorder;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import net.minecraft.server.level.ServerLevel;
import javax.annotation.Nullable;
@@ -17,8 +17,8 @@
public record SettlementWorkOrderPublishContext(
SettlementWorkOrderRuntime runtime,
UUID claimUuid,
- BannerModSettlementBuildingRecord building,
- BannerModSettlementSnapshot snapshot,
+ SettlementBuildingRecord building,
+ SettlementSnapshot snapshot,
@Nullable ServerLevel level,
long gameTime
) {
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisher.java
index 2fc9f117..0701bef9 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisher.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement.workorder;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
/**
* Building-type-specific pass that converts building state into concrete
@@ -12,7 +12,7 @@
*/
public interface SettlementWorkOrderPublisher {
/** Fast-check whether this publisher handles a building record. */
- boolean matches(BannerModSettlementBuildingRecord building);
+ boolean matches(SettlementBuildingRecord building);
/** Emit zero or more work orders for {@code ctx.building()} into {@code ctx.runtime()}. */
void publish(SettlementWorkOrderPublishContext ctx);
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistry.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistry.java
index 8ae26ebf..7da8f55b 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistry.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistry.java
@@ -1,8 +1,10 @@
package com.talhanation.bannermod.settlement.workorder;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import com.talhanation.bannermod.settlement.workorder.publisher.BuildAreaWorkOrderPublisher;
+import com.talhanation.bannermod.settlement.workorder.publisher.AnimalPenWorkOrderPublisher;
import com.talhanation.bannermod.settlement.workorder.publisher.CropAreaWorkOrderPublisher;
+import com.talhanation.bannermod.settlement.workorder.publisher.FishingAreaWorkOrderPublisher;
import com.talhanation.bannermod.settlement.workorder.publisher.LumberAreaWorkOrderPublisher;
import com.talhanation.bannermod.settlement.workorder.publisher.MiningAreaWorkOrderPublisher;
import com.talhanation.bannermod.settlement.workorder.publisher.StockpileTransportWorkOrderPublisher;
@@ -25,7 +27,9 @@ public final class SettlementWorkOrderPublisherRegistry {
/** Pre-populated registry containing publishers for every work-area type currently shipped. */
public static SettlementWorkOrderPublisherRegistry defaults() {
SettlementWorkOrderPublisherRegistry registry = new SettlementWorkOrderPublisherRegistry();
+ registry.register(new AnimalPenWorkOrderPublisher());
registry.register(new CropAreaWorkOrderPublisher());
+ registry.register(new FishingAreaWorkOrderPublisher());
registry.register(new BuildAreaWorkOrderPublisher());
registry.register(new LumberAreaWorkOrderPublisher());
registry.register(new MiningAreaWorkOrderPublisher());
@@ -46,7 +50,7 @@ public int size() {
return publishers.size();
}
- public static boolean matchesBuildingType(BannerModSettlementBuildingRecord building, String bareTypeId) {
+ public static boolean matchesBuildingType(SettlementBuildingRecord building, String bareTypeId) {
if (building == null || building.buildingTypeId() == null || bareTypeId == null || bareTypeId.isBlank()) {
return false;
}
@@ -62,7 +66,7 @@ public void clear() {
}
public void publishAll(SettlementWorkOrderPublishContext ctx) {
- BannerModSettlementBuildingRecord building = ctx.building();
+ SettlementBuildingRecord building = ctx.building();
for (SettlementWorkOrderPublisher publisher : publishers) {
if (publisher.matches(building)) {
publisher.publish(ctx);
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderType.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderType.java
index 881c9b7a..74c8e320 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderType.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderType.java
@@ -16,6 +16,12 @@ public enum SettlementWorkOrderType {
MINE_BLOCK,
+ FISH,
+
+ ANIMAL_BREED,
+ ANIMAL_SPECIAL_TASK,
+ ANIMAL_SLAUGHTER,
+
BREAK_BLOCK,
BUILD_BLOCK,
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/AnimalPenWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/AnimalPenWorkOrderPublisher.java
new file mode 100644
index 00000000..294530d8
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/AnimalPenWorkOrderPublisher.java
@@ -0,0 +1,104 @@
+package com.talhanation.bannermod.settlement.workorder.publisher;
+
+import com.talhanation.bannermod.ai.civilian.AnimalFarmerLoopProgress;
+import com.talhanation.bannermod.entity.civilian.workarea.AnimalPenArea;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisherRegistry;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderType;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.animal.Animal;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Emits animal-husbandry work orders in the same action order as AnimalFarmerLoopProgress. */
+public final class AnimalPenWorkOrderPublisher implements SettlementWorkOrderPublisher {
+
+ private static final int PRIORITY_BREED = 90;
+ private static final int PRIORITY_SPECIAL_TASK = 80;
+ private static final int PRIORITY_SLAUGHTER = 70;
+
+ @Override
+ public boolean matches(SettlementBuildingRecord building) {
+ return SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "animal_pen_area");
+ }
+
+ @Override
+ public void publish(SettlementWorkOrderPublishContext ctx) {
+ ServerLevel level = ctx.level();
+ if (level == null) {
+ return;
+ }
+ Entity entity = level.getEntity(ctx.building().buildingUuid());
+ if (!(entity instanceof AnimalPenArea pen) || !pen.isAlive()) {
+ return;
+ }
+
+ publishPlannedOrders(ctx, plan(pen));
+ }
+
+ static List<PlannedAnimalOrder> plan(AnimalPenArea pen) {
+ pen.scanAnimalBreed();
+ pen.scanAnimalSpecial();
+ pen.scanAnimalSlaughter();
+
+ AnimalFarmerLoopProgress.Decision decision = AnimalFarmerLoopProgress.selectNextAction(
+ pen.getBreed(), pen.isBreedTime(), pen.animalsToBreed.size(),
+ pen.getSpecial(), pen.animalsForSpecialTask.size(), pen.getAnimalType() == AnimalPenArea.AnimalTypes.CHICKEN,
+ pen.getSlaughter(), pen.animalsToSlaughter.size(), pen.getMaxAnimals());
+
+ List<PlannedAnimalOrder> planned = new ArrayList<>();
+ switch (decision.action()) {
+ case PREPARE_BREED -> {
+ int amountToBreed = pen.animalsToBreed.size() - (pen.animalsToBreed.size() % 2);
+ for (int i = 0; i < amountToBreed; i++) {
+ planned.add(new PlannedAnimalOrder(SettlementWorkOrderType.ANIMAL_BREED,
+ pen.animalsToBreed.get(i).blockPosition(), PRIORITY_BREED));
+ }
+ }
+ case PREPARE_SPECIAL_TASK -> {
+ if (pen.getAnimalType() == AnimalPenArea.AnimalTypes.CHICKEN) {
+ planned.add(new PlannedAnimalOrder(SettlementWorkOrderType.ANIMAL_SPECIAL_TASK,
+ BlockPos.containing(pen.getArea().getCenter()), PRIORITY_SPECIAL_TASK));
+ } else {
+ for (Animal animal : pen.animalsForSpecialTask) {
+ planned.add(new PlannedAnimalOrder(SettlementWorkOrderType.ANIMAL_SPECIAL_TASK,
+ animal.blockPosition(), PRIORITY_SPECIAL_TASK));
+ }
+ }
+ }
+ case PREPARE_SLAUGHTER -> {
+ int amountToSlaughter = pen.animalsToSlaughter.size() - pen.getMaxAnimals();
+ for (int i = 0; i < amountToSlaughter; i++) {
+ planned.add(new PlannedAnimalOrder(SettlementWorkOrderType.ANIMAL_SLAUGHTER,
+ pen.animalsToSlaughter.get(i).blockPosition(), PRIORITY_SLAUGHTER));
+ }
+ }
+ default -> {
+ }
+ }
+ return planned;
+ }
+
+ private void publishPlannedOrders(SettlementWorkOrderPublishContext ctx, List<PlannedAnimalOrder> plannedOrders) {
+ for (PlannedAnimalOrder planned : plannedOrders) {
+ ctx.runtime().publish(SettlementWorkOrder.pending(
+ ctx.claimUuid(),
+ ctx.building().buildingUuid(),
+ planned.type(),
+ planned.target(),
+ null,
+ planned.priority(),
+ ctx.gameTime()
+ ));
+ }
+ }
+
+ record PlannedAnimalOrder(SettlementWorkOrderType type, BlockPos target, int priority) {
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/BuildAreaWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/BuildAreaWorkOrderPublisher.java
index 9015b281..495f6074 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/BuildAreaWorkOrderPublisher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/BuildAreaWorkOrderPublisher.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.entity.civilian.workarea.BuildArea;
import com.talhanation.bannermod.persistence.civilian.BuildBlock;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
@@ -28,7 +28,7 @@ public final class BuildAreaWorkOrderPublisher implements SettlementWorkOrderPub
private static final int PRIORITY_BUILD = 65;
@Override
- public boolean matches(BannerModSettlementBuildingRecord building) {
+ public boolean matches(SettlementBuildingRecord building) {
return SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "build_area");
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/CropAreaWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/CropAreaWorkOrderPublisher.java
index 31d9bf4f..1d44318c 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/CropAreaWorkOrderPublisher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/CropAreaWorkOrderPublisher.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.workorder.publisher;
import com.talhanation.bannermod.entity.civilian.workarea.CropArea;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
@@ -26,7 +26,7 @@ public final class CropAreaWorkOrderPublisher implements SettlementWorkOrderPubl
private static final int PRIORITY_PLANT = 50;
@Override
- public boolean matches(BannerModSettlementBuildingRecord building) {
+ public boolean matches(SettlementBuildingRecord building) {
return SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "crop_area");
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/FishingAreaWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/FishingAreaWorkOrderPublisher.java
new file mode 100644
index 00000000..55593703
--- /dev/null
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/FishingAreaWorkOrderPublisher.java
@@ -0,0 +1,44 @@
+package com.talhanation.bannermod.settlement.workorder.publisher;
+
+import com.talhanation.bannermod.entity.civilian.workarea.FishingArea;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisherRegistry;
+import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderType;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+
+/** Emits one repeatable fishing order at the fishing area's water target. */
+public final class FishingAreaWorkOrderPublisher implements SettlementWorkOrderPublisher {
+ private static final int PRIORITY_FISH = 50;
+
+ @Override
+ public boolean matches(SettlementBuildingRecord building) {
+ return SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "fishing_area");
+ }
+
+ @Override
+ public void publish(SettlementWorkOrderPublishContext ctx) {
+ ServerLevel level = ctx.level();
+ if (level == null) {
+ return;
+ }
+ Entity entity = level.getEntity(ctx.building().buildingUuid());
+ if (!(entity instanceof FishingArea fishingArea) || !fishingArea.isAlive()) {
+ return;
+ }
+
+ SettlementWorkOrder order = SettlementWorkOrder.pending(
+ ctx.claimUuid(),
+ ctx.building().buildingUuid(),
+ SettlementWorkOrderType.FISH,
+ fishingArea.getOnPos().immutable(),
+ null,
+ PRIORITY_FISH,
+ ctx.gameTime()
+ );
+ ctx.runtime().publish(order);
+ }
+}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/LumberAreaWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/LumberAreaWorkOrderPublisher.java
index ee8a2b97..ba73e759 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/LumberAreaWorkOrderPublisher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/LumberAreaWorkOrderPublisher.java
@@ -2,7 +2,7 @@
import com.talhanation.bannermod.entity.civilian.workarea.LumberArea;
import com.talhanation.bannermod.persistence.civilian.Tree;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
@@ -27,7 +27,7 @@ public final class LumberAreaWorkOrderPublisher implements SettlementWorkOrderPu
private static final int PRIORITY_REPLANT = 40;
@Override
- public boolean matches(BannerModSettlementBuildingRecord building) {
+ public boolean matches(SettlementBuildingRecord building) {
return SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "lumber_area");
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/MiningAreaWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/MiningAreaWorkOrderPublisher.java
index 31c52a12..387c9825 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/MiningAreaWorkOrderPublisher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/MiningAreaWorkOrderPublisher.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.workorder.publisher;
import com.talhanation.bannermod.entity.civilian.workarea.MiningArea;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
@@ -22,7 +22,7 @@ public final class MiningAreaWorkOrderPublisher implements SettlementWorkOrderPu
private static final int PRIORITY_MINE = 55;
@Override
- public boolean matches(BannerModSettlementBuildingRecord building) {
+ public boolean matches(SettlementBuildingRecord building) {
return SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "mining_area");
}
diff --git a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/StockpileTransportWorkOrderPublisher.java b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/StockpileTransportWorkOrderPublisher.java
index 5da1ae00..d1f24f6b 100644
--- a/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/StockpileTransportWorkOrderPublisher.java
+++ b/src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/StockpileTransportWorkOrderPublisher.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.workorder.publisher;
import com.talhanation.bannermod.entity.civilian.workarea.StorageArea;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublishContext;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderPublisher;
@@ -34,7 +34,7 @@ public final class StockpileTransportWorkOrderPublisher implements SettlementWor
private static final int BASE_PRIORITY = 55;
@Override
- public boolean matches(BannerModSettlementBuildingRecord building) {
+ public boolean matches(SettlementBuildingRecord building) {
return building != null && building.stockpileBuilding() && building.stockpileRouteAuthored();
}
diff --git a/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementClientSnapshotContract.java b/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementClientSnapshotContract.java
index 3b77b2f8..20e45496 100644
--- a/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementClientSnapshotContract.java
+++ b/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementClientSnapshotContract.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.shared.settlement;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import javax.annotation.Nullable;
import java.util.Objects;
@@ -43,7 +43,7 @@ public enum SnapshotState {
public record Payload(
UUID claimUuid,
- @Nullable BannerModSettlementSnapshot settlementSnapshot,
+ @Nullable SettlementSnapshot settlementSnapshot,
@Nullable BannerModGovernorSnapshot governorSnapshot
) {
public Payload {
diff --git a/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementRefreshSupport.java b/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementRefreshSupport.java
index 39567276..b7b4e78b 100644
--- a/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementRefreshSupport.java
+++ b/src/main/java/com/talhanation/bannermod/shared/settlement/BannerModSettlementRefreshSupport.java
@@ -1,11 +1,11 @@
package com.talhanation.bannermod.shared.settlement;
import com.talhanation.bannermod.events.ClaimEvents;
-import com.talhanation.bannermod.events.RecruitEvents;
+import com.talhanation.bannermod.entity.military.runtime.RecruitEvents;
import com.talhanation.bannermod.governance.BannerModGovernorManager;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementService;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementService;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
@@ -24,10 +24,10 @@ public static void refreshSnapshot(ServerLevel level, @Nullable BlockPos pos) {
}
INVOCATIONS.incrementAndGet();
RecruitsClaim claim = ClaimEvents.claimManager().getClaim(new net.minecraft.world.level.ChunkPos(pos));
- BannerModSettlementService.refreshClaimAt(
+ SettlementService.refreshClaimAt(
level,
ClaimEvents.claimManager(),
- BannerModSettlementManager.get(level),
+ SettlementManager.get(level),
BannerModGovernorManager.get(level),
pos
);
diff --git a/src/main/java/com/talhanation/bannermod/util/FormationDimensionGuard.java b/src/main/java/com/talhanation/bannermod/util/FormationDimensionGuard.java
index 1a97e854..1f64a622 100644
--- a/src/main/java/com/talhanation/bannermod/util/FormationDimensionGuard.java
+++ b/src/main/java/com/talhanation/bannermod/util/FormationDimensionGuard.java
@@ -77,6 +77,10 @@ public static boolean leaderInDifferentDimension(@Nullable Level recruitLevel, @
* — the counter increment is a useful signal either way.
*/
public static boolean shouldHoldDueToDimensionMismatch(@Nullable Level recruitLevel, @Nullable LivingEntity leader) {
+ if (leader != null && leader.isRemoved()) {
+ RuntimeProfilingCounters.increment(COUNTER_KEY);
+ return true;
+ }
Level leaderLevel = leader == null ? null : leader.level();
if (leaderInDifferentDimension(recruitLevel, leaderLevel)) {
RuntimeProfilingCounters.increment(COUNTER_KEY);
diff --git a/src/main/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicy.java b/src/main/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicy.java
index cf624d6a..c4ac23e3 100644
--- a/src/main/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicy.java
+++ b/src/main/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicy.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.war.registry;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import java.util.LinkedHashSet;
import java.util.Locale;
@@ -11,12 +11,12 @@ public final class PoliticalStatePromotionPolicy {
private PoliticalStatePromotionPolicy() {
}
- public static Result evaluate(BannerModSettlementSnapshot snapshot) {
+ public static Result evaluate(SettlementSnapshot snapshot) {
if (snapshot == null) {
return new Result(false, Set.of("settlement_snapshot"));
}
Set<String> present = new LinkedHashSet<>();
- for (BannerModSettlementBuildingRecord building : snapshot.buildings()) {
+ for (SettlementBuildingRecord building : snapshot.buildings()) {
present.add(normalize(building.buildingTypeId()));
}
diff --git a/src/main/java/com/talhanation/bannermod/war/runtime/WarDeclarationRuntime.java b/src/main/java/com/talhanation/bannermod/war/runtime/WarDeclarationRuntime.java
index bbe99912..d97fbbcc 100644
--- a/src/main/java/com/talhanation/bannermod/war/runtime/WarDeclarationRuntime.java
+++ b/src/main/java/com/talhanation/bannermod/war/runtime/WarDeclarationRuntime.java
@@ -56,6 +56,14 @@ public Optional<WarDeclarationRecord> byId(UUID id) {
return Optional.ofNullable(warsById.get(id));
}
+ public boolean remove(UUID id) {
+ boolean removed = warsById.remove(id) != null;
+ if (removed) {
+ dirtyListener.run();
+ }
+ return removed;
+ }
+
public Optional<WarDeclarationRecord> byIdFragment(String token) {
if (token == null || token.isBlank()) {
return Optional.empty();
diff --git a/src/main/resources/assets/bannermod/lang/en_us.json b/src/main/resources/assets/bannermod/lang/en_us.json
index 009c2d24..14a6b8a0 100644
--- a/src/main/resources/assets/bannermod/lang/en_us.json
+++ b/src/main/resources/assets/bannermod/lang/en_us.json
@@ -643,7 +643,10 @@
"gui.bannermod.worker_screen.title": "Worker Ledger",
"gui.bannermod.worker_screen.refresh": "Refresh",
"gui.bannermod.worker_screen.refresh.tooltip": "Request a fresh server snapshot for this worker.",
+ "gui.bannermod.worker_screen.actions": "Actions",
+ "gui.bannermod.worker_screen.actions.tooltip": "Open server-authoritative worker actions.",
"gui.bannermod.worker_screen.convert": "To Citizen",
+ "gui.bannermod.worker_screen.dismiss": "Dismiss",
"gui.bannermod.worker_screen.close": "Close",
"gui.bannermod.worker_screen.close.tooltip": "Return to the world.",
"gui.bannermod.worker_screen.hint": "Snapshot from server. Refresh after ownership or work-area changes.",
@@ -673,6 +676,11 @@
"gui.bannermod.worker_screen.reassign.option.builder": "Builder",
"gui.bannermod.worker_screen.reassign.option.merchant": "Merchant",
"gui.bannermod.worker_screen.reassign.option.fisherman": "Fisherman",
+ "chat.bannermod.workerui.dismiss.success": "Worker dismissed.",
+ "chat.bannermod.workerui.dismiss.denied.missing": "That worker is no longer available.",
+ "chat.bannermod.workerui.dismiss.denied.dead": "That worker is already gone.",
+ "chat.bannermod.workerui.dismiss.denied.too_far": "Move closer to dismiss this worker.",
+ "chat.bannermod.workerui.dismiss.denied.not_owner": "Only the worker owner or an admin can dismiss this worker.",
"chat.bannermod.workerui.reassign.success": "%s now serves you.",
"chat.bannermod.workerui.reassign.denied.missing": "That worker is no longer available.",
"chat.bannermod.workerui.reassign.denied.invalid_profession": "Choose a worker profession to reassign to.",
@@ -2568,7 +2576,10 @@
"bannermod.assign_home.reject.not_owner": "You don't own that unit, so you can't reassign their home.",
"bannermod.assign_home.reject.invalid_block": "That block isn't a valid home - pick a bed or a registered sleeping zone.",
"bannermod.assign_home.button": "Assign Home",
+ "bannermod.assign_home.tooltip": "Close this profile and choose a bed for this unit.",
"bannermod.assign_home.prompt": "Right-click a bed within 30 seconds to assign it as home (ESC to cancel).",
+ "bannermod.assign_home.hud.title": "Assign Home: right-click a bed",
+ "bannermod.assign_home.hud.remaining": "%s seconds left - ESC cancels",
"bannermod.assign_home.cancel.escape": "Assign-Home cancelled.",
"bannermod.assign_home.cancel.timeout": "Assign-Home timed out - try again.",
"perk.bannermod.universal.toughness_i": "Toughness I",
diff --git a/src/main/resources/assets/bannermod/lang/ru_ru.json b/src/main/resources/assets/bannermod/lang/ru_ru.json
index 8db00d87..403d7df6 100644
--- a/src/main/resources/assets/bannermod/lang/ru_ru.json
+++ b/src/main/resources/assets/bannermod/lang/ru_ru.json
@@ -642,7 +642,10 @@
"gui.bannermod.worker_screen.title": "Книга работника",
"gui.bannermod.worker_screen.refresh": "Обновить",
"gui.bannermod.worker_screen.refresh.tooltip": "Запросить свежий снимок этого работника с сервера.",
+ "gui.bannermod.worker_screen.actions": "Действия",
+ "gui.bannermod.worker_screen.actions.tooltip": "Открыть серверные действия с работником.",
"gui.bannermod.worker_screen.convert": "В гражданина",
+ "gui.bannermod.worker_screen.dismiss": "Уволить",
"gui.bannermod.worker_screen.close": "Закрыть",
"gui.bannermod.worker_screen.close.tooltip": "Вернуться в мир.",
"gui.bannermod.worker_screen.hint": "Это снимок с сервера. Обновите после смены владельца или рабочей зоны.",
@@ -672,6 +675,11 @@
"gui.bannermod.worker_screen.reassign.option.builder": "Строитель",
"gui.bannermod.worker_screen.reassign.option.merchant": "Торговец",
"gui.bannermod.worker_screen.reassign.option.fisherman": "Рыбак",
+ "chat.bannermod.workerui.dismiss.success": "Работник уволен.",
+ "chat.bannermod.workerui.dismiss.denied.missing": "Этот работник больше недоступен.",
+ "chat.bannermod.workerui.dismiss.denied.dead": "Этот работник уже исчез.",
+ "chat.bannermod.workerui.dismiss.denied.too_far": "Подойдите ближе, чтобы уволить работника.",
+ "chat.bannermod.workerui.dismiss.denied.not_owner": "Уволить работника может только владелец или администратор.",
"chat.bannermod.workerui.reassign.success": "%s теперь служит вам.",
"chat.bannermod.workerui.reassign.denied.missing": "Этот работник больше недоступен.",
"chat.bannermod.workerui.reassign.denied.invalid_profession": "Выберите рабочую профессию для смены.",
@@ -2478,7 +2486,10 @@
"bannermod.assign_home.reject.not_owner": "Вы не владеете этим юнитом, нельзя сменить ему дом.",
"bannermod.assign_home.reject.invalid_block": "Этот блок нельзя сделать домом - выберите кровать или зарегистрированную спальную зону.",
"bannermod.assign_home.button": "Назначить дом",
+ "bannermod.assign_home.tooltip": "Закрыть профиль и выбрать кровать для этого юнита.",
"bannermod.assign_home.prompt": "ПКМ по кровати в течение 30 секунд, чтобы назначить её домом (ESC - отмена).",
+ "bannermod.assign_home.hud.title": "Назначение дома: ПКМ по кровати",
+ "bannermod.assign_home.hud.remaining": "Осталось %s с - ESC отменяет",
"bannermod.assign_home.cancel.escape": "Назначение дома отменено.",
"bannermod.assign_home.cancel.timeout": "Время на выбор дома истекло - повторите.",
"perk.bannermod.universal.toughness_i": "Стойкость I",
diff --git a/src/main/resources/data/bannermod/perks/bowman_steady_aim_i.json b/src/main/resources/data/bannermod/perks/bowman_steady_aim_i.json
new file mode 100644
index 00000000..dbf27ac0
--- /dev/null
+++ b/src/main/resources/data/bannermod/perks/bowman_steady_aim_i.json
@@ -0,0 +1,12 @@
+{
+ "id": "bowman/steady_aim_i",
+ "archetype": "bowman",
+ "point_cost": 1,
+ "prerequisites": [],
+ "bonuses": [
+ {
+ "stat": "ranged_accuracy",
+ "amount": 0.05
+ }
+ ]
+}
diff --git a/src/main/resources/data/bannermod/perks/cavalry_swift_charge_i.json b/src/main/resources/data/bannermod/perks/cavalry_swift_charge_i.json
new file mode 100644
index 00000000..99eae17f
--- /dev/null
+++ b/src/main/resources/data/bannermod/perks/cavalry_swift_charge_i.json
@@ -0,0 +1,12 @@
+{
+ "id": "cavalry/swift_charge_i",
+ "archetype": "cavalry",
+ "point_cost": 1,
+ "prerequisites": [],
+ "bonuses": [
+ {
+ "stat": "movement_speed",
+ "amount": 0.01
+ }
+ ]
+}
diff --git a/src/main/resources/data/bannermod/perks/crossbowman_heavy_bolts_i.json b/src/main/resources/data/bannermod/perks/crossbowman_heavy_bolts_i.json
new file mode 100644
index 00000000..28e5e1ea
--- /dev/null
+++ b/src/main/resources/data/bannermod/perks/crossbowman_heavy_bolts_i.json
@@ -0,0 +1,12 @@
+{
+ "id": "crossbowman/heavy_bolts_i",
+ "archetype": "crossbowman",
+ "point_cost": 1,
+ "prerequisites": [],
+ "bonuses": [
+ {
+ "stat": "ranged_velocity",
+ "amount": 0.1
+ }
+ ]
+}
diff --git a/src/main/resources/data/bannermod/perks/pikeman_braced_stance_i.json b/src/main/resources/data/bannermod/perks/pikeman_braced_stance_i.json
new file mode 100644
index 00000000..94d7757b
--- /dev/null
+++ b/src/main/resources/data/bannermod/perks/pikeman_braced_stance_i.json
@@ -0,0 +1,12 @@
+{
+ "id": "pikeman/braced_stance_i",
+ "archetype": "pikeman",
+ "point_cost": 1,
+ "prerequisites": [],
+ "bonuses": [
+ {
+ "stat": "knockback_resist",
+ "amount": 0.1
+ }
+ ]
+}
diff --git a/src/main/resources/data/bannermod/perks/swordsman_iron_grip_i.json b/src/main/resources/data/bannermod/perks/swordsman_iron_grip_i.json
new file mode 100644
index 00000000..130e1906
--- /dev/null
+++ b/src/main/resources/data/bannermod/perks/swordsman_iron_grip_i.json
@@ -0,0 +1,12 @@
+{
+ "id": "swordsman/iron_grip_i",
+ "archetype": "swordsman",
+ "point_cost": 1,
+ "prerequisites": [],
+ "bonuses": [
+ {
+ "stat": "attack_damage",
+ "amount": 0.5
+ }
+ ]
+}
diff --git a/src/main/resources/data/bannermod/perks/universal_toughness_i.json b/src/main/resources/data/bannermod/perks/universal_toughness_i.json
new file mode 100644
index 00000000..596e961d
--- /dev/null
+++ b/src/main/resources/data/bannermod/perks/universal_toughness_i.json
@@ -0,0 +1,12 @@
+{
+ "id": "universal/toughness_i",
+ "archetype": "universal",
+ "point_cost": 1,
+ "prerequisites": [],
+ "bonuses": [
+ {
+ "stat": "max_health",
+ "amount": 2.0
+ }
+ ]
+}
diff --git a/src/test/java/com/talhanation/bannermod/BannerModIntegratedRuntimeSmokeTest.java b/src/test/java/com/talhanation/bannermod/BannerModIntegratedRuntimeSmokeTest.java
index 44b138c3..3ffd7567 100644
--- a/src/test/java/com/talhanation/bannermod/BannerModIntegratedRuntimeSmokeTest.java
+++ b/src/test/java/com/talhanation/bannermod/BannerModIntegratedRuntimeSmokeTest.java
@@ -16,7 +16,7 @@ void recruitRuntimeIdentityAndWorkerSubsystemSeamShareOneBannerModRuntime() {
assertEquals(BannerModMain.MOD_ID, WorkersRuntime.modId());
assertEquals(BannerModNetworkBootstrap.workerPacketOffset(), WorkersRuntime.networkIdOffset());
assertEquals(BannerModNetworkBootstrap.MILITARY_MESSAGES.length, BannerModNetworkBootstrap.workerPacketOffset());
- assertEquals(32, BannerModNetworkBootstrap.CIVILIAN_MESSAGES.length);
+ assertEquals(33, BannerModNetworkBootstrap.CIVILIAN_MESSAGES.length);
assertTrue(BannerModNetworkBootstrap.CIVILIAN_MESSAGES.length > 0);
}
}
diff --git a/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusDismissContractTest.java b/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusDismissContractTest.java
new file mode 100644
index 00000000..9ad809d9
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusDismissContractTest.java
@@ -0,0 +1,98 @@
+package com.talhanation.bannermod.client.civilian;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Pins the WorkerStatusScreen dismiss contract from WORKERUI-001B.
+ * Source-level invariants only — no Minecraft client bootstrap.
+ */
+class WorkerStatusDismissContractTest {
+ private static final Path ROOT = Path.of("");
+
+ private static final String WORKER_STATUS_SCREEN =
+ "src/main/java/com/talhanation/bannermod/client/civilian/gui/WorkerStatusScreen.java";
+ private static final String DISMISS_MESSAGE =
+ "src/main/java/com/talhanation/bannermod/network/messages/civilian/MessageDismissWorker.java";
+ private static final String DISMISS_SERVICE =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/WorkerDismissService.java";
+ private static final String CATALOG =
+ "src/main/java/com/talhanation/bannermod/network/catalog/CivilianPacketCatalog.java";
+ private static final String EN_LANG =
+ "src/main/resources/assets/bannermod/lang/en_us.json";
+ private static final String RU_LANG =
+ "src/main/resources/assets/bannermod/lang/ru_ru.json";
+
+ @Test
+ void workerStatusScreenExposesDismissAction() throws IOException {
+ String src = read(WORKER_STATUS_SCREEN);
+ assertTrue(src.contains("MessageDismissWorker"),
+ "WorkerStatusScreen must send MessageDismissWorker for dismiss intent");
+ assertTrue(src.contains("ActionMenuButton"),
+ "WorkerStatusScreen must keep dismiss inside the compact action-menu style");
+ assertTrue(src.contains("gui.bannermod.worker_screen.dismiss"),
+ "WorkerStatusScreen must expose a localized Dismiss entry");
+ assertTrue(src.contains("buildWorkerActionEntries"),
+ "WorkerStatusScreen must group worker mutation actions without adding another bottom-row button");
+ }
+
+ @Test
+ void dismissMessageIsServerAuthoritative() throws IOException {
+ assertTrue(Files.exists(ROOT.resolve(DISMISS_MESSAGE)),
+ "MessageDismissWorker.java must exist");
+ String src = read(DISMISS_MESSAGE);
+ assertTrue(src.contains("BannerModMessage.serverbound()"),
+ "MessageDismissWorker must declare serverbound packet flow");
+ assertTrue(src.contains("context.getSender()"),
+ "MessageDismissWorker must derive authority from the real server sender");
+ assertTrue(src.contains("WorkerDismissService.dismissDeniedReasonKey(player, worker)"),
+ "MessageDismissWorker must validate before mutating worker state");
+ assertTrue(src.contains("WorkerDismissService.dismiss(player, worker)"),
+ "MessageDismissWorker must delegate the mutation to the server-side dismiss service");
+ }
+
+ @Test
+ void ownerAndAdminCanDismissButNonOwnerCannotMutate() throws IOException {
+ String src = read(DISMISS_SERVICE);
+ assertTrue(src.contains("player.getUUID().equals(worker.getOwnerUUID()) || player.hasPermissions(2)"),
+ "Dismiss authority must allow only the worker owner or an admin");
+ assertTrue(src.contains("return \"chat.bannermod.workerui.dismiss.denied.not_owner\""),
+ "Non-owner/non-admin dismiss attempts must receive denied feedback");
+ int denialCheck = src.indexOf("dismissDeniedReasonKey(player, worker) != null");
+ int workAreaMutation = src.indexOf("setBeingWorkedOn(false)");
+ int discardMutation = src.indexOf("worker.discard()");
+ assertTrue(denialCheck >= 0 && workAreaMutation > denialCheck && discardMutation > denialCheck,
+ "Dismiss must perform no worker state mutation before the owner/admin denial check");
+ }
+
+ @Test
+ void dismissMessageRegisteredAndLocalized() throws IOException {
+ assertTrue(read(CATALOG).contains("MessageDismissWorker.class"),
+ "CivilianPacketCatalog must register MessageDismissWorker");
+ String[] keys = {
+ "gui.bannermod.worker_screen.actions",
+ "gui.bannermod.worker_screen.actions.tooltip",
+ "gui.bannermod.worker_screen.dismiss",
+ "chat.bannermod.workerui.dismiss.success",
+ "chat.bannermod.workerui.dismiss.denied.missing",
+ "chat.bannermod.workerui.dismiss.denied.dead",
+ "chat.bannermod.workerui.dismiss.denied.too_far",
+ "chat.bannermod.workerui.dismiss.denied.not_owner",
+ };
+ String en = read(EN_LANG);
+ String ru = read(RU_LANG);
+ for (String key : keys) {
+ assertTrue(en.contains("\"" + key + "\""), "en_us.json missing key: " + key);
+ assertTrue(ru.contains("\"" + key + "\""), "ru_ru.json missing key: " + key);
+ }
+ }
+
+ private String read(String relativePath) throws IOException {
+ return Files.readString(ROOT.resolve(relativePath));
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusReassignContractTest.java b/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusReassignContractTest.java
index 4633433b..0b23d879 100644
--- a/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusReassignContractTest.java
+++ b/src/test/java/com/talhanation/bannermod/client/civilian/WorkerStatusReassignContractTest.java
@@ -39,8 +39,8 @@ void workerStatusScreenWiresReassignAction() throws IOException {
"WorkerStatusScreen must use ActionMenuButton for the Reassign dropdown");
assertTrue(src.contains("gui.bannermod.worker_screen.reassign"),
"WorkerStatusScreen must reference the reassign trigger translatable key");
- assertTrue(src.contains("gui.bannermod.worker_screen.convert.tooltip.dismiss_path"),
- "Convert button must carry the dismiss-path tooltip key clarifying the convert flow");
+ assertTrue(src.contains("gui.bannermod.worker_screen.actions"),
+ "Convert action must live inside the compact worker Actions menu after the dismiss split");
assertTrue(src.contains("CitizenProfession"),
"Reassign menu must enumerate CitizenProfession entries to filter out the current one");
}
diff --git a/src/test/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirrorTest.java b/src/test/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirrorTest.java
index fdaee849..c5468016 100644
--- a/src/test/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirrorTest.java
+++ b/src/test/java/com/talhanation/bannermod/client/settlement/BannerModSettlementClientMirrorTest.java
@@ -2,13 +2,13 @@
import com.talhanation.bannermod.governance.BannerModGovernorPolicy;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodsSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementStockpileSummary;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignalState;
-import com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodsSnapshot;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementStockpileSummary;
+import com.talhanation.bannermod.settlement.SettlementSupplySignalState;
+import com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Envelope;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Payload;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.RefreshTrigger;
@@ -45,7 +45,7 @@ void governorViewMovesThroughLoadingEmptyFreshAndStaleStates() {
BannerModGovernorSnapshot governor = BannerModGovernorSnapshot.create(claimId, new ChunkPos(3, 4), "blue")
.withHeartbeatReport(30L, 30L, 7, 5, 3, List.of("low_food"), List.of("increase_garrison"))
.withPolicies(4, 2, 1);
- BannerModSettlementSnapshot settlement = BannerModSettlementSnapshot.create(claimId, new ChunkPos(3, 4), "blue");
+ SettlementSnapshot settlement = SettlementSnapshot.create(claimId, new ChunkPos(3, 4), "blue");
mirror.applyGovernorUpdate(recruitId, Envelope.ready(12L, 12L, RefreshTrigger.SCREEN_OPEN,
new Payload(claimId, settlement, governor)));
BannerModSettlementClientMirror.GovernorView fresh = mirror.governorView(recruitId);
@@ -69,7 +69,7 @@ void loginAndMutationRefreshUpdatesReplaceGovernorSnapshot() {
UUID recruitId = UUID.randomUUID();
UUID claimId = UUID.randomUUID();
BannerModSettlementClientMirror mirror = new BannerModSettlementClientMirror();
- BannerModSettlementSnapshot settlement = BannerModSettlementSnapshot.create(claimId, new ChunkPos(6, 7), "green");
+ SettlementSnapshot settlement = SettlementSnapshot.create(claimId, new ChunkPos(6, 7), "green");
BannerModGovernorSnapshot loginGovernor = BannerModGovernorSnapshot.create(claimId, new ChunkPos(6, 7), "green")
.withHeartbeatReport(20L, 20L, 2, 1, 0, List.of(), List.of());
BannerModGovernorSnapshot mutationGovernor = loginGovernor
@@ -102,7 +102,7 @@ void governorViewCopiesSeaTradeStatusLinesIntoLogisticsLines() {
"gui.bannermod.governor.logistics.sea_trade.missing_ship 3205 unassigned gui.bannermod.governor.logistics.sea_trade.reason.no_carrier minecraft:wheat 0 16",
"gui.bannermod.governor.logistics.sea_trade.blocked_cargo 3206 2201 gui.bannermod.governor.logistics.sea_trade.reason.destination_full minecraft:wheat 4 16"
);
- BannerModSettlementSnapshot settlement = settlementWithSeaTradeLines(claimId, seaTradeLines);
+ SettlementSnapshot settlement = settlementWithSeaTradeLines(claimId, seaTradeLines);
BannerModGovernorSnapshot governor = BannerModGovernorSnapshot.create(claimId, new ChunkPos(3, 4), "blue");
mirror.applyGovernorUpdate(recruitId, Envelope.ready(12L, 12L, RefreshTrigger.SCREEN_OPEN,
@@ -112,8 +112,8 @@ void governorViewCopiesSeaTradeStatusLinesIntoLogisticsLines() {
assertTrue(view.logisticsLines().containsAll(seaTradeLines));
}
- private static BannerModSettlementSnapshot settlementWithSeaTradeLines(UUID claimId, List<String> seaTradeLines) {
- return new BannerModSettlementSnapshot(
+ private static SettlementSnapshot settlementWithSeaTradeLines(UUID claimId, List<String> seaTradeLines) {
+ return new SettlementSnapshot(
claimId,
3,
4,
@@ -125,12 +125,12 @@ private static BannerModSettlementSnapshot settlementWithSeaTradeLines(UUID clai
0,
0,
0,
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- new BannerModSettlementTradeRouteHandoffSeed(0, 0, 0, 0, 0, 0, List.of(), List.of(), seaTradeLines),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ new SettlementTradeRouteHandoffSnapshot(0, 0, 0, 0, 0, 0, List.of(), List.of(), seaTradeLines),
+ SettlementSupplySignalState.empty(),
List.of(),
List.of()
);
diff --git a/src/test/java/com/talhanation/bannermod/events/EventPackageContractTest.java b/src/test/java/com/talhanation/bannermod/events/EventPackageContractTest.java
new file mode 100644
index 00000000..7d008d88
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/events/EventPackageContractTest.java
@@ -0,0 +1,41 @@
+package com.talhanation.bannermod.events;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class EventPackageContractTest {
+ private static final Pattern SUBSCRIBE_EVENT_ANNOTATION = Pattern.compile("(?m)^\\s*@SubscribeEvent\\b");
+
+ @Test
+ void eventsPackageContainsOnlySubscribeEventHosts() throws IOException {
+ Path eventsRoot = Path.of("src", "main", "java", "com", "talhanation", "bannermod", "events");
+ List<String> violations = new ArrayList<>();
+
+ try (Stream<Path> paths = Files.walk(eventsRoot)) {
+ paths.filter(path -> path.toString().endsWith(".java"))
+ .sorted()
+ .forEach(path -> {
+ try {
+ String source = Files.readString(path);
+ if (!SUBSCRIBE_EVENT_ANNOTATION.matcher(source).find()) {
+ violations.add(eventsRoot.relativize(path).toString());
+ }
+ } catch (IOException exception) {
+ throw new IllegalStateException("Unable to read " + path, exception);
+ }
+ });
+ }
+
+ assertTrue(violations.isEmpty(),
+ "events/ may contain only @SubscribeEvent hosts: " + violations);
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/events/RecruitGovernorWorkflowTest.java b/src/test/java/com/talhanation/bannermod/events/RecruitGovernorWorkflowTest.java
index cce7b7cc..78c8c16a 100644
--- a/src/test/java/com/talhanation/bannermod/events/RecruitGovernorWorkflowTest.java
+++ b/src/test/java/com/talhanation/bannermod/events/RecruitGovernorWorkflowTest.java
@@ -3,7 +3,7 @@
import com.talhanation.bannermod.governance.runtime.RecruitGovernorWorkflow;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
import com.talhanation.bannermod.persistence.military.RecruitsClaim;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Envelope;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.RefreshTrigger;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.SnapshotState;
@@ -21,7 +21,7 @@ class RecruitGovernorWorkflowTest {
void screenOpenLoginAndMutationRefreshBuildReadySettlementMirrorPayloads() {
RecruitsClaim claim = new RecruitsClaim("sync-004", UUID.randomUUID());
claim.setCenter(new ChunkPos(2, 3));
- BannerModSettlementSnapshot settlement = BannerModSettlementSnapshot.create(claim.getUUID(), new ChunkPos(2, 3), "sync-team");
+ SettlementSnapshot settlement = SettlementSnapshot.create(claim.getUUID(), new ChunkPos(2, 3), "sync-team");
BannerModGovernorSnapshot governor = BannerModGovernorSnapshot.create(claim.getUUID(), new ChunkPos(2, 3), "sync-team")
.withGovernor(UUID.randomUUID(), UUID.randomUUID());
@@ -35,7 +35,7 @@ void screenOpenLoginAndMutationRefreshBuildReadySettlementMirrorPayloads() {
private static void assertEnvelope(Envelope envelope,
UUID claimId,
- BannerModSettlementSnapshot settlement,
+ SettlementSnapshot settlement,
BannerModGovernorSnapshot governor,
RefreshTrigger trigger) {
assertEquals(SnapshotState.READY, envelope.state());
diff --git a/src/test/java/com/talhanation/bannermod/network/BannerModMessageFuzzHarnessTest.java b/src/test/java/com/talhanation/bannermod/network/BannerModMessageFuzzHarnessTest.java
index 86b54da6..4fd67e62 100644
--- a/src/test/java/com/talhanation/bannermod/network/BannerModMessageFuzzHarnessTest.java
+++ b/src/test/java/com/talhanation/bannermod/network/BannerModMessageFuzzHarnessTest.java
@@ -19,7 +19,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
@@ -45,9 +44,8 @@
* </ul>
*
* <p>Acceptance for TESTFUZZ-001 is the harness existing and running. Handlers that DO leak a
- * {@link RuntimeException} on adversarial input are documented in
- * {@link #KNOWN_LEAKY_HANDLERS} with a {@code TODO(FUZZHARDEN-001)} marker and tracked under the
- * follow-up backlog task. Hardening the handlers themselves is explicitly out of scope here.
+ * {@link RuntimeException} on adversarial input should be hardened or, if intentionally deferred,
+ * documented in {@link #KNOWN_LEAKY_HANDLERS} with a tracked follow-up.
*/
class BannerModMessageFuzzHarnessTest {
@@ -67,98 +65,7 @@ class BannerModMessageFuzzHarnessTest {
private static final int FUZZ_INPUTS_PER_CLASS = 5;
- /**
- * Handlers known to leak {@link RuntimeException} on adversarial input. Populated by running
- * the harness, classifying the failure, and filing a follow-up under FUZZHARDEN-001.
- *
- * <p>Each entry is annotated with {@code TODO(FUZZHARDEN-<id>): <one-line description>} so
- * grep finds them when the follow-up task hardens the handler.
- */
- private static final Set<String> KNOWN_LEAKY_HANDLERS = new HashSet<>();
-
- static {
- // TODO(FUZZHARDEN-001): each handler below leaks NullPointerException when dispatched
- // with a null sender (or null/zero UUID fields). The harness gates them as
- // expected-failing so it can stay green; FUZZHARDEN-001 hardens the handlers themselves
- // so they explicitly null-check `context.getSender()` and the relevant resolver outputs.
- // Generated by running this harness once on master tip 2d7c268c.
- String[] knownLeaky = {
- "com.talhanation.bannermod.network.messages.civilian.MessageAssignHome",
- "com.talhanation.bannermod.network.messages.civilian.MessageOpenMerchantEditTradeScreen",
- "com.talhanation.bannermod.network.messages.civilian.MessageOpenMerchantTradeScreen",
- "com.talhanation.bannermod.network.messages.military.MessageAdminRecruitSpawn",
- "com.talhanation.bannermod.network.messages.military.MessageAggro",
- "com.talhanation.bannermod.network.messages.military.MessageAggroGui",
- "com.talhanation.bannermod.network.messages.military.MessageAnswerMessenger",
- "com.talhanation.bannermod.network.messages.military.MessageApplyNoGroup",
- "com.talhanation.bannermod.network.messages.military.MessageAssassinCount",
- "com.talhanation.bannermod.network.messages.military.MessageAssassinGui",
- "com.talhanation.bannermod.network.messages.military.MessageAssassinate",
- "com.talhanation.bannermod.network.messages.military.MessageAssignGroupToCompanion",
- "com.talhanation.bannermod.network.messages.military.MessageAssignGroupToPlayer",
- "com.talhanation.bannermod.network.messages.military.MessageAssignNearbyRecruitsInGroup",
- "com.talhanation.bannermod.network.messages.military.MessageAssignRecruitToPlayer",
- "com.talhanation.bannermod.network.messages.military.MessageAttack",
- "com.talhanation.bannermod.network.messages.military.MessageBackToMountEntity",
- "com.talhanation.bannermod.network.messages.military.MessageClearTarget",
- "com.talhanation.bannermod.network.messages.military.MessageClearTargetGui",
- "com.talhanation.bannermod.network.messages.military.MessageClearUpkeep",
- "com.talhanation.bannermod.network.messages.military.MessageClearUpkeepGui",
- "com.talhanation.bannermod.network.messages.military.MessageCombatStance",
- "com.talhanation.bannermod.network.messages.military.MessageCombatStanceGui",
- "com.talhanation.bannermod.network.messages.military.MessageCommandScreen",
- "com.talhanation.bannermod.network.messages.military.MessageDebugGui",
- "com.talhanation.bannermod.network.messages.military.MessageDebugScreen",
- "com.talhanation.bannermod.network.messages.military.MessageDisband",
- "com.talhanation.bannermod.network.messages.military.MessageDisbandGroup",
- "com.talhanation.bannermod.network.messages.military.MessageDismount",
- "com.talhanation.bannermod.network.messages.military.MessageDismountGui",
- "com.talhanation.bannermod.network.messages.military.MessageFaceCommand",
- "com.talhanation.bannermod.network.messages.military.MessageFollowGui",
- "com.talhanation.bannermod.network.messages.military.MessageFormationFollowMovement",
- "com.talhanation.bannermod.network.messages.military.MessageGroup",
- "com.talhanation.bannermod.network.messages.military.MessageHire",
- "com.talhanation.bannermod.network.messages.military.MessageHireFromNobleVillager",
- "com.talhanation.bannermod.network.messages.military.MessageHireGui",
- "com.talhanation.bannermod.network.messages.military.MessageListen",
- "com.talhanation.bannermod.network.messages.military.MessageMergeGroup",
- "com.talhanation.bannermod.network.messages.military.MessageMountEntity",
- "com.talhanation.bannermod.network.messages.military.MessageMountEntityGui",
- "com.talhanation.bannermod.network.messages.military.MessageMovement",
- "com.talhanation.bannermod.network.messages.military.MessageOpenDisbandScreen",
- "com.talhanation.bannermod.network.messages.military.MessageOpenGovernorScreen",
- "com.talhanation.bannermod.network.messages.military.MessageOpenPromoteScreen",
- "com.talhanation.bannermod.network.messages.military.MessageOpenSpecialScreen",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderAddWayPoint",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderRemoveWayPoint",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetCycle",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetEnemyAction",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetInfoMode",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetPatrolState",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetPatrollingSpeed",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetRoute",
- "com.talhanation.bannermod.network.messages.military.MessagePatrolLeaderSetWaitTime",
- "com.talhanation.bannermod.network.messages.military.MessageProtectEntity",
- "com.talhanation.bannermod.network.messages.military.MessageRangedFire",
- "com.talhanation.bannermod.network.messages.military.MessageRecruitGui",
- "com.talhanation.bannermod.network.messages.military.MessageRemoveAssignedGroupFromCompanion",
- "com.talhanation.bannermod.network.messages.military.MessageRest",
- "com.talhanation.bannermod.network.messages.military.MessageScoutTask",
- "com.talhanation.bannermod.network.messages.military.MessageSelectRecruits",
- "com.talhanation.bannermod.network.messages.military.MessageSendMessenger",
- "com.talhanation.bannermod.network.messages.military.MessageSetLeaderGroup",
- "com.talhanation.bannermod.network.messages.military.MessageShields",
- "com.talhanation.bannermod.network.messages.military.MessageSplitGroup",
- "com.talhanation.bannermod.network.messages.military.MessageStrategicFire",
- "com.talhanation.bannermod.network.messages.military.MessageTransferRoute",
- "com.talhanation.bannermod.network.messages.military.MessageUpdateGovernorPolicy",
- "com.talhanation.bannermod.network.messages.military.MessageUpdateGroup",
- "com.talhanation.bannermod.network.messages.military.MessageUpkeepEntity",
- "com.talhanation.bannermod.network.messages.military.MessageUpkeepPos",
- "com.talhanation.bannermod.network.messages.military.MessageWriteSpawnEgg",
- };
- Collections.addAll(KNOWN_LEAKY_HANDLERS, knownLeaky);
- }
+ private static final Set<String> KNOWN_LEAKY_HANDLERS = Set.of();
@Test
void fuzzEveryBannerModMessageSubclass() throws Exception {
@@ -252,8 +159,8 @@ void fuzzEveryBannerModMessageSubclass() throws Exception {
StringBuilder msg = new StringBuilder();
msg.append("Fuzz harness detected ").append(uniqueLeakers.size())
.append(" handlers leaking RuntimeException on adversarial input. ");
- msg.append("Either add them to KNOWN_LEAKY_HANDLERS with a TODO(FUZZHARDEN-001) ")
- .append("comment and track them under a follow-up task, or harden the handlers.\n");
+ msg.append("Either harden the handlers or add them to KNOWN_LEAKY_HANDLERS ")
+ .append("with a tracked follow-up.\n");
msg.append("Unique leaking classes:\n");
for (String leakerClass : uniqueLeakers) {
msg.append(" - ").append(leakerClass).append('\n');
diff --git a/src/test/java/com/talhanation/bannermod/network/messages/military/AssassinLeaderControlAuthorityTest.java b/src/test/java/com/talhanation/bannermod/network/messages/military/AssassinLeaderControlAuthorityTest.java
index 0e154b96..9f8181a8 100644
--- a/src/test/java/com/talhanation/bannermod/network/messages/military/AssassinLeaderControlAuthorityTest.java
+++ b/src/test/java/com/talhanation/bannermod/network/messages/military/AssassinLeaderControlAuthorityTest.java
@@ -1,12 +1,16 @@
package com.talhanation.bannermod.network.messages.military;
+import com.talhanation.bannermod.entity.military.AssassinLeaderCountAuthority;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.UUID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
class AssassinLeaderControlAuthorityTest {
@@ -33,14 +37,10 @@ void countPacketChecksControlOwnerWithoutAssigningIt() throws IOException {
Path handlerPath = Paths.get("src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinCount.java");
String source = Files.readString(handlerPath);
- int controlCheck = source.indexOf("leader.isControlledBy(player) || player.hasPermissions(2)");
- int countMutation = source.indexOf("leader.setCount(this.count)");
+ int controlCheck = source.indexOf("leader.trySetCountFrom(player.getUUID(), player.hasPermissions(2), this.count)");
int ownerAssignment = source.indexOf("assignControlOwnerIfAbsent");
assertTrue(controlCheck >= 0, "count updates must require the server-side control owner or op permission");
- assertTrue(countMutation >= 0, "authorized count updates must still set the leader count");
- assertTrue(controlCheck < countMutation,
- "forged count packets must hit the owner-or-op authority check before count mutation");
assertTrue(ownerAssignment < 0, "count packets must not assign or claim control ownership");
}
@@ -49,20 +49,46 @@ void countPacketRejectsForeignNonOpAndKeepsRangeGate() throws IOException {
Path handlerPath = Paths.get("src/main/java/com/talhanation/bannermod/network/messages/military/MessageAssassinCount.java");
String source = Files.readString(handlerPath);
- int authorityCheck = source.indexOf("leader.isControlledBy(player) || player.hasPermissions(2)");
+ int authorityCheck = source.indexOf("leader.trySetCountFrom(player.getUUID(), player.hasPermissions(2), this.count)");
int rangeCheck = source.indexOf("player.getBoundingBox().inflate(16.0D).intersects(leader.getBoundingBox())");
- int countMutation = source.indexOf("leader.setCount(this.count)");
+ int entityMutation = source.indexOf("leader.trySetCountFrom(player.getUUID(), player.hasPermissions(2), this.count)");
assertTrue(authorityCheck >= 0, "foreign non-op senders must not satisfy the owner-or-op count gate");
assertTrue(rangeCheck >= 0, "count updates must preserve the existing nearby-leader range gate");
- assertTrue(countMutation >= 0, "owner or op senders must still be able to update count");
- assertTrue(authorityCheck < countMutation, "foreign non-op senders must be rejected before count mutation");
- assertTrue(rangeCheck < countMutation, "range validation must still run before count mutation");
- assertTrue(source.indexOf("player.hasPermissions(2)") < countMutation,
- "op senders must pass the authority gate before count mutation");
- assertTrue(source.indexOf("leader.isControlledBy(player)") < countMutation,
- "owner senders must pass the authority gate before count mutation");
- assertTrue(countMutation == source.lastIndexOf("leader.setCount(this.count)"),
+ assertTrue(entityMutation >= 0, "owner or op senders must still be able to update count");
+ assertTrue(rangeCheck < entityMutation, "range validation must still run before count mutation");
+ assertTrue(source.contains("player.hasPermissions(2)"),
+ "op senders must pass into the authority gate before count mutation");
+ assertTrue(source.contains("player.getUUID()"),
+ "owner identity must pass into the authority gate before count mutation");
+ assertTrue(entityMutation == source.lastIndexOf("leader.trySetCountFrom(player.getUUID(), player.hasPermissions(2), this.count)"),
"the guarded handler path must be the only count mutation entry point");
}
+
+ @Test
+ void foreignNonOpSenderLeavesAssassinLeaderCountUnchanged() {
+ UUID owner = UUID.fromString("00000000-0000-0000-0000-000000008001");
+ UUID foreignSender = UUID.fromString("00000000-0000-0000-0000-000000008002");
+ ForeignAssassinLeader leader = new ForeignAssassinLeader(owner, 3);
+
+ boolean changed = AssassinLeaderCountAuthority.trySetCount(leader.controlOwnerUUID, foreignSender, false,
+ 7, leader::setCount);
+
+ assertFalse(changed, "foreign non-op senders must fail the count authority gate");
+ assertEquals(3, leader.count, "foreign non-op sender must leave the assassin leader count unchanged");
+ }
+
+ private static final class ForeignAssassinLeader {
+ private final UUID controlOwnerUUID;
+ private int count;
+
+ private ForeignAssassinLeader(UUID controlOwnerUUID, int count) {
+ this.controlOwnerUUID = controlOwnerUUID;
+ this.count = count;
+ }
+
+ public void setCount(int count) {
+ this.count = count;
+ }
+ }
}
diff --git a/src/test/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntityTest.java b/src/test/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntityTest.java
new file mode 100644
index 00000000..e555e157
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/network/messages/military/MessageReassignClaimPoliticalEntityTest.java
@@ -0,0 +1,83 @@
+package com.talhanation.bannermod.network.messages.military;
+
+import com.talhanation.bannermod.persistence.military.RecruitsClaim;
+import com.talhanation.bannermod.war.registry.PoliticalEntityAuthority;
+import com.talhanation.bannermod.war.registry.PoliticalEntityRecord;
+import com.talhanation.bannermod.war.registry.PoliticalEntityStatus;
+import net.minecraft.core.BlockPos;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class MessageReassignClaimPoliticalEntityTest {
+ private static final UUID ACTOR = UUID.fromString("00000000-0000-0000-0000-000000000001");
+ private static final UUID OTHER = UUID.fromString("00000000-0000-0000-0000-000000000002");
+ private static final UUID SOURCE_ID = UUID.fromString("00000000-0000-0000-0000-0000000000aa");
+ private static final UUID TARGET_ID = UUID.fromString("00000000-0000-0000-0000-0000000000bb");
+
+ @Test
+ void authorizedActorTransfersClaimToTargetPoliticalEntity() {
+ RecruitsClaim claim = new RecruitsClaim("border claim", SOURCE_ID);
+ PoliticalEntityRecord source = entity(SOURCE_ID, "Source", ACTOR);
+ PoliticalEntityRecord target = entity(TARGET_ID, "Target", ACTOR);
+ UUID[] republishedOwner = new UUID[1];
+
+ MessageReassignClaimPoliticalEntity.TransferResult result = MessageReassignClaimPoliticalEntity.reassignClaimPoliticalEntityAndRepublish(
+ ACTOR,
+ false,
+ claim,
+ source,
+ target,
+ TARGET_ID,
+ republishedClaim -> republishedOwner[0] = republishedClaim.getOwnerPoliticalEntityId());
+
+ assertTrue(result.transferred());
+ assertNull(result.denialKey());
+ assertEquals(TARGET_ID, claim.getOwnerPoliticalEntityId());
+ assertEquals(TARGET_ID, republishedOwner[0]);
+ }
+
+ @Test
+ void actorWithoutTargetAuthorityIsDeniedAndClaimOwnerRemainsUnchanged() {
+ RecruitsClaim claim = new RecruitsClaim("border claim", SOURCE_ID);
+ PoliticalEntityRecord source = entity(SOURCE_ID, "Source", ACTOR);
+ PoliticalEntityRecord target = entity(TARGET_ID, "Target", OTHER);
+ boolean[] republished = new boolean[1];
+
+ MessageReassignClaimPoliticalEntity.TransferResult result = MessageReassignClaimPoliticalEntity.reassignClaimPoliticalEntityAndRepublish(
+ ACTOR,
+ false,
+ claim,
+ source,
+ target,
+ TARGET_ID,
+ republishedClaim -> republished[0] = true);
+
+ assertFalse(result.transferred());
+ assertEquals("chat.bannermod.claim.transfer.denied.no_target_authority", result.denialKey());
+ assertEquals(PoliticalEntityAuthority.DENIAL_LEADER_ONLY_KEY, result.denialReasonKey());
+ assertEquals(SOURCE_ID, claim.getOwnerPoliticalEntityId());
+ assertFalse(republished[0]);
+ }
+
+ private static PoliticalEntityRecord entity(UUID id, String name, UUID leader) {
+ return new PoliticalEntityRecord(
+ id,
+ name,
+ PoliticalEntityStatus.STATE,
+ leader,
+ List.of(),
+ BlockPos.ZERO,
+ "",
+ "",
+ "",
+ "",
+ 0L);
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreenTest.java b/src/test/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreenTest.java
index 6ca5ffc4..c9671441 100644
--- a/src/test/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreenTest.java
+++ b/src/test/java/com/talhanation/bannermod/network/messages/military/MessageToClientUpdateGovernorScreenTest.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.network.messages.military;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Envelope;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.Payload;
import com.talhanation.bannermod.shared.settlement.BannerModSettlementClientSnapshotContract.RefreshTrigger;
@@ -21,7 +21,7 @@ class MessageToClientUpdateGovernorScreenTest {
void roundTripsSettlementSnapshotEnvelopeForMutationRefresh() {
UUID recruitId = UUID.randomUUID();
UUID claimId = UUID.randomUUID();
- BannerModSettlementSnapshot settlement = BannerModSettlementSnapshot.create(claimId, new ChunkPos(4, 5), "sync-team");
+ SettlementSnapshot settlement = SettlementSnapshot.create(claimId, new ChunkPos(4, 5), "sync-team");
BannerModGovernorSnapshot governor = BannerModGovernorSnapshot.create(claimId, new ChunkPos(4, 5), "sync-team")
.withHeartbeatReport(50L, 50L, 6, 4, 2, java.util.List.of("incident"), java.util.List.of("recommend"));
Envelope envelope = Envelope.ready(50L, 50L, RefreshTrigger.MUTATION_REFRESH,
diff --git a/src/test/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanoutTest.java b/src/test/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanoutTest.java
index 5edb6b62..672bef5e 100644
--- a/src/test/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanoutTest.java
+++ b/src/test/java/com/talhanation/bannermod/persistence/military/ClaimRemovalFanoutTest.java
@@ -4,8 +4,8 @@
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
import com.talhanation.bannermod.governance.BannerModTreasuryLedgerSnapshot;
import com.talhanation.bannermod.governance.BannerModTreasuryManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementManager;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementManager;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import com.talhanation.bannermod.war.runtime.OccupationRuntime;
import com.talhanation.bannermod.war.runtime.RevoltRuntime;
import com.talhanation.bannermod.war.runtime.RevoltState;
@@ -36,9 +36,9 @@ void fanoutClearsTreasurySettlementGovernorOccupationsAndRevoltsForTargetClaim()
treasury.depositTaxes(claimUuid, anchorChunk, "blueguild", 30, 100L);
treasury.depositTaxes(otherClaimUuid, new ChunkPos(50, 50), "redguild", 12, 100L);
- BannerModSettlementManager settlements = new BannerModSettlementManager();
- settlements.putSnapshot(BannerModSettlementSnapshot.create(claimUuid, anchorChunk, "blueguild"));
- settlements.putSnapshot(BannerModSettlementSnapshot.create(otherClaimUuid, new ChunkPos(50, 50), "redguild"));
+ SettlementManager settlements = new SettlementManager();
+ settlements.putSnapshot(SettlementSnapshot.create(claimUuid, anchorChunk, "blueguild"));
+ settlements.putSnapshot(SettlementSnapshot.create(otherClaimUuid, new ChunkPos(50, 50), "redguild"));
BannerModGovernorManager governors = new BannerModGovernorManager();
governors.putSnapshot(BannerModGovernorSnapshot.create(claimUuid, anchorChunk, "blueguild")
@@ -97,8 +97,8 @@ void fanoutIsIdempotent() {
List<ChunkPos> chunks = List.of(chunk);
BannerModTreasuryManager treasury = new BannerModTreasuryManager();
treasury.depositTaxes(claimUuid, chunk, "blueguild", 5, 50L);
- BannerModSettlementManager settlements = new BannerModSettlementManager();
- settlements.putSnapshot(BannerModSettlementSnapshot.create(claimUuid, chunk, "blueguild"));
+ SettlementManager settlements = new SettlementManager();
+ settlements.putSnapshot(SettlementSnapshot.create(claimUuid, chunk, "blueguild"));
BannerModGovernorManager governors = new BannerModGovernorManager();
OccupationRuntime occupations = new OccupationRuntime();
RevoltRuntime revolts = new RevoltRuntime();
@@ -121,7 +121,7 @@ void fanoutIsIdempotent() {
void fanoutNoOpWhenClaimUuidIsNull() {
ClaimRemovalFanout.FanoutResult result = ClaimRemovalFanout.apply(
null, List.of(new ChunkPos(0, 0)), new BannerModTreasuryManager(),
- new BannerModSettlementManager(), new BannerModGovernorManager(),
+ new SettlementManager(), new BannerModGovernorManager(),
new OccupationRuntime(), new RevoltRuntime(), null);
assertFalse(result.treasuryLedgerRemoved());
assertFalse(result.settlementSnapshotRemoved());
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeedTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeedTest.java
index a1f6bd35..f55b714b 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeedTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingProfileSeedTest.java
@@ -4,49 +4,49 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
-class BannerModSettlementBuildingProfileSeedTest {
+class SettlementBuildingProfileSeedTest {
@Test
void categoryMatchesExpectedEnumBuckets() {
- assertEquals(BannerModSettlementBuildingCategory.FOOD, BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION.category());
- assertEquals(BannerModSettlementBuildingCategory.MATERIAL, BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION.category());
- assertEquals(BannerModSettlementBuildingCategory.STORAGE, BannerModSettlementBuildingProfileSeed.STORAGE.category());
- assertEquals(BannerModSettlementBuildingCategory.MARKET, BannerModSettlementBuildingProfileSeed.MARKET.category());
- assertEquals(BannerModSettlementBuildingCategory.CONSTRUCTION, BannerModSettlementBuildingProfileSeed.CONSTRUCTION.category());
- assertEquals(BannerModSettlementBuildingCategory.GENERAL, BannerModSettlementBuildingProfileSeed.GENERAL.category());
+ assertEquals(SettlementBuildingCategory.FOOD, SettlementBuildingProfileSeed.FOOD_PRODUCTION.category());
+ assertEquals(SettlementBuildingCategory.MATERIAL, SettlementBuildingProfileSeed.MATERIAL_PRODUCTION.category());
+ assertEquals(SettlementBuildingCategory.STORAGE, SettlementBuildingProfileSeed.STORAGE.category());
+ assertEquals(SettlementBuildingCategory.MARKET, SettlementBuildingProfileSeed.MARKET.category());
+ assertEquals(SettlementBuildingCategory.CONSTRUCTION, SettlementBuildingProfileSeed.CONSTRUCTION.category());
+ assertEquals(SettlementBuildingCategory.GENERAL, SettlementBuildingProfileSeed.GENERAL.category());
}
@Test
void fromBuildingTypeIdMapsKnownPathsAndFallsBackToGeneral() {
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(null));
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId(" "));
- assertEquals(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("bannermod:crop_area"));
- assertEquals(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("animal_pen_area"));
- assertEquals(BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("bannermod:mining_area"));
- assertEquals(BannerModSettlementBuildingProfileSeed.STORAGE,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("storage_area"));
- assertEquals(BannerModSettlementBuildingProfileSeed.MARKET,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("market_area"));
- assertEquals(BannerModSettlementBuildingProfileSeed.CONSTRUCTION,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("build_area"));
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL,
- BannerModSettlementBuildingProfileSeed.fromBuildingTypeId("bannermod:watchtower"));
+ assertEquals(SettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingProfileSeed.fromBuildingTypeId(null));
+ assertEquals(SettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingProfileSeed.fromBuildingTypeId(" "));
+ assertEquals(SettlementBuildingProfileSeed.FOOD_PRODUCTION,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("bannermod:crop_area"));
+ assertEquals(SettlementBuildingProfileSeed.FOOD_PRODUCTION,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("animal_pen_area"));
+ assertEquals(SettlementBuildingProfileSeed.MATERIAL_PRODUCTION,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("bannermod:mining_area"));
+ assertEquals(SettlementBuildingProfileSeed.STORAGE,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("storage_area"));
+ assertEquals(SettlementBuildingProfileSeed.MARKET,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("market_area"));
+ assertEquals(SettlementBuildingProfileSeed.CONSTRUCTION,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("build_area"));
+ assertEquals(SettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingProfileSeed.fromBuildingTypeId("bannermod:watchtower"));
}
@Test
void fromTagNameFallsBackToGeneralForBlankOrUnknownValues() {
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL,
- BannerModSettlementBuildingProfileSeed.fromTagName(null));
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL,
- BannerModSettlementBuildingProfileSeed.fromTagName(""));
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL,
- BannerModSettlementBuildingProfileSeed.fromTagName("NOT_REAL"));
- assertEquals(BannerModSettlementBuildingProfileSeed.MARKET,
- BannerModSettlementBuildingProfileSeed.fromTagName("MARKET"));
+ assertEquals(SettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingProfileSeed.fromTagName(null));
+ assertEquals(SettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingProfileSeed.fromTagName(""));
+ assertEquals(SettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingProfileSeed.fromTagName("NOT_REAL"));
+ assertEquals(SettlementBuildingProfileSeed.MARKET,
+ SettlementBuildingProfileSeed.fromTagName("MARKET"));
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecordTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecordTest.java
index 6d23b1cd..f59848a0 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecordTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementBuildingRecordTest.java
@@ -9,11 +9,11 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
-class BannerModSettlementBuildingRecordTest {
+class SettlementBuildingRecordTest {
@Test
void buildingRecordRoundTripsCategoryAndProfileSeed() {
- BannerModSettlementBuildingRecord original = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord original = new SettlementBuildingRecord(
UUID.randomUUID(),
"bannermod:market_area",
new BlockPos(12, 64, 12),
@@ -29,11 +29,11 @@ void buildingRecordRoundTripsCategoryAndProfileSeed() {
true,
true,
List.of("food", "materials"),
- BannerModSettlementBuildingCategory.MARKET,
- BannerModSettlementBuildingProfileSeed.MARKET
+ SettlementBuildingCategory.MARKET,
+ SettlementBuildingProfileSeed.MARKET
);
- BannerModSettlementBuildingRecord restored = BannerModSettlementBuildingRecord.fromTag(original.toTag());
+ SettlementBuildingRecord restored = SettlementBuildingRecord.fromTag(original.toTag());
assertEquals(original, restored);
}
@@ -48,9 +48,9 @@ void buildingRecordDefaultsLegacyProfileSeedFromBuildingType() {
tag.putInt("WorkplaceSlots", 1);
tag.putInt("AssignedWorkerCount", 0);
- BannerModSettlementBuildingRecord restored = BannerModSettlementBuildingRecord.fromTag(tag);
+ SettlementBuildingRecord restored = SettlementBuildingRecord.fromTag(tag);
- assertEquals(BannerModSettlementBuildingCategory.STORAGE, restored.buildingCategory());
- assertEquals(BannerModSettlementBuildingProfileSeed.STORAGE, restored.buildingProfileSeed());
+ assertEquals(SettlementBuildingCategory.STORAGE, restored.buildingCategory());
+ assertEquals(SettlementBuildingProfileSeed.STORAGE, restored.buildingProfileSeed());
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSeedTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSeedTest.java
deleted file mode 100644
index 6816016a..00000000
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSeedTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import net.minecraft.nbt.CompoundTag;
-import org.junit.jupiter.api.Test;
-
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-class BannerModSettlementDesiredGoodsSeedTest {
-
- @Test
- void desiredGoodsSeedRoundTripsPersistedDrivers() {
- BannerModSettlementDesiredGoodsSeed original = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 2),
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 3)
- ));
-
- CompoundTag tag = original.toTag();
- BannerModSettlementDesiredGoodsSeed restored = BannerModSettlementDesiredGoodsSeed.fromTag(tag);
-
- assertEquals(original, restored);
- }
-}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSnapshotTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSnapshotTest.java
new file mode 100644
index 00000000..b82472d3
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementDesiredGoodsSnapshotTest.java
@@ -0,0 +1,25 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.nbt.CompoundTag;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SettlementDesiredGoodsSnapshotTest {
+
+ @Test
+ void desiredGoodsSnapshotRoundTripsPersistedDrivers() {
+ SettlementDesiredGoodsSnapshot original = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 2),
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 3)
+ ));
+
+ CompoundTag tag = original.toTag();
+ SettlementDesiredGoodsSnapshot restored = SettlementDesiredGoodsSnapshot.fromTag(tag);
+
+ assertEquals(original, restored);
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementLogisticsDerivationServiceTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementLogisticsDerivationServiceTest.java
new file mode 100644
index 00000000..23126689
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementLogisticsDerivationServiceTest.java
@@ -0,0 +1,101 @@
+package com.talhanation.bannermod.settlement;
+
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeSummary;
+import net.minecraft.core.BlockPos;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SettlementLogisticsDerivationServiceTest {
+
+ @Test
+ void logisticsDerivationServiceCombinesStockpileProjectAndSupplySeeds() {
+ UUID storageUuid = UUID.randomUUID();
+ UUID marketUuid = UUID.randomUUID();
+ SettlementBuildingRecord storage = new SettlementBuildingRecord(storageUuid, "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 2, 54, true, true, List.of("merchants"));
+ SettlementBuildingRecord market = new SettlementBuildingRecord(marketUuid, "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of());
+ SettlementResidentRecord seller = new SettlementResidentRecord(
+ UUID.randomUUID(),
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentScheduleWindowSeed.LABOR_DAY,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ SettlementResidentServiceContract.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING,
+ marketUuid,
+ "bannermod:market_area"
+ ),
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ UUID.randomUUID(),
+ "blueguild",
+ marketUuid,
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ );
+ SettlementMarketState marketState = new SettlementMarketState(
+ 1,
+ 1,
+ 27,
+ 9,
+ 1,
+ 1,
+ List.of(new SettlementMarketRecord(marketUuid, "Harbor Square", true, 27, 9)),
+ List.of(new SettlementSellerDispatchRecord(seller.residentUuid(), marketUuid, "Harbor Square", SettlementSellerDispatchState.READY))
+ );
+
+ SettlementLogisticsDerivationService.LogisticsResult logistics = SettlementLogisticsDerivationService.derive(
+ List.of(storage, market),
+ List.of(seller),
+ marketState,
+ List.of(),
+ List.of(),
+ List.of(),
+ List.of(),
+ true,
+ true
+ );
+
+ SettlementStockpileSummary expectedStockpile = SettlementSnapshotRuntime.summarizeStockpiles(List.of(storage, market), List.of());
+ SettlementDesiredGoodsSnapshot expectedDesiredGoods = SettlementSnapshotRuntime.summarizeDesiredGoods(
+ List.of(storage, market),
+ expectedStockpile,
+ marketState,
+ BannerModSeaTradeSummary.summarise(List.of())
+ );
+ SettlementProjectCandidateSnapshot expectedProject = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(storage, market),
+ expectedStockpile,
+ expectedDesiredGoods,
+ marketState,
+ true,
+ true
+ );
+ SettlementTradeRouteHandoffSnapshot expectedTradeRouteHandoff = SettlementSnapshotRuntime.summarizeTradeRouteHandoffSnapshot(
+ expectedStockpile,
+ marketState,
+ expectedDesiredGoods,
+ SettlementSnapshotRuntime.ReservationSignalSeed.empty(),
+ BannerModSeaTradeSummary.summarise(List.of()),
+ List.of()
+ );
+ SettlementSupplySignalState expectedSupplySignals = SettlementSnapshotRuntime.summarizeSupplySignals(
+ expectedDesiredGoods,
+ expectedStockpile,
+ marketState,
+ List.of(seller),
+ List.of(storage, market),
+ SettlementSnapshotRuntime.ReservationSignalSeed.empty(),
+ BannerModSeaTradeSummary.summarise(List.of())
+ );
+
+ assertEquals(expectedStockpile, logistics.stockpileSummary());
+ assertEquals(expectedDesiredGoods, logistics.desiredGoodsSnapshot());
+ assertEquals(expectedProject, logistics.projectCandidateSnapshot());
+ assertEquals(expectedTradeRouteHandoff, logistics.tradeRouteHandoffSnapshot());
+ assertEquals(expectedSupplySignals, logistics.supplySignalState());
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementManagerTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementManagerTest.java
index 0f4c5adb..24914f4e 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementManagerTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementManagerTest.java
@@ -15,7 +15,7 @@
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-class BannerModSettlementManagerTest {
+class SettlementManagerTest {
@Test
void managerRoundTripsResidentAndBuildingSeedDataByClaimUuid() {
@@ -23,7 +23,7 @@ void managerRoundTripsResidentAndBuildingSeedDataByClaimUuid() {
UUID workerUuid = UUID.randomUUID();
UUID workAreaUuid = UUID.randomUUID();
- BannerModSettlementSnapshot original = new BannerModSettlementSnapshot(
+ SettlementSnapshot original = new SettlementSnapshot(
claim.getUUID(),
claim.getCenter().x,
claim.getCenter().z,
@@ -35,31 +35,31 @@ void managerRoundTripsResidentAndBuildingSeedDataByClaimUuid() {
1,
0,
0,
- new BannerModSettlementStockpileSummary(1, 2, 54, 1, 0, List.of("farmers", "merchants")),
- new BannerModSettlementMarketState(
+ new SettlementStockpileSummary(1, 2, 54, 1, 0, List.of("farmers", "merchants")),
+ new SettlementMarketState(
1,
1,
27,
9,
1,
1,
- List.of(new BannerModSettlementMarketRecord(workAreaUuid, "Harbor Square", true, 27, 9)),
- List.of(new BannerModSettlementSellerDispatchRecord(workerUuid, workAreaUuid, "Harbor Square", BannerModSettlementSellerDispatchState.READY))
+ List.of(new SettlementMarketRecord(workAreaUuid, "Harbor Square", true, 27, 9)),
+ List.of(new SettlementSellerDispatchRecord(workerUuid, workAreaUuid, "Harbor Square", SettlementSellerDispatchState.READY))
),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 1),
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1)
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 1),
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1)
)),
- new BannerModSettlementProjectCandidateSeed(
+ new SettlementProjectCandidateSnapshot(
"storage_foundation",
- BannerModSettlementBuildingProfileSeed.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE,
4,
true,
true,
List.of("storage_missing", "goods_pressure", "market_access_present")
),
- new BannerModSettlementTradeRouteHandoffSeed(
+ new SettlementTradeRouteHandoffSnapshot(
1,
1,
1,
@@ -67,40 +67,40 @@ void managerRoundTripsResidentAndBuildingSeedDataByClaimUuid() {
1,
16,
List.of(
- new BannerModSettlementDesiredGoodSeed("food", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 1),
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1)
+ new SettlementDesiredGoodSnapshot("food", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 1),
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1)
),
- List.of(new BannerModSettlementSellerDispatchRecord(workerUuid, workAreaUuid, "Harbor Square", BannerModSettlementSellerDispatchState.READY)),
+ List.of(new SettlementSellerDispatchRecord(workerUuid, workAreaUuid, "Harbor Square", SettlementSellerDispatchState.READY)),
List.of()
),
- new BannerModSettlementSupplySignalState(
+ new SettlementSupplySignalState(
3,
1,
1,
5,
List.of(
- new BannerModSettlementSupplySignal("food", 1, 1, 0, 2),
- new BannerModSettlementSupplySignal("market_goods", 1, 0, 1, 2),
- new BannerModSettlementSupplySignal("storage_type:merchants", 1, 1, 0, 1)
+ new SettlementSupplySignal("food", 1, 1, 0, 2),
+ new SettlementSupplySignal("market_goods", 1, 0, 1, 2),
+ new SettlementSupplySignal("storage_type:merchants", 1, 1, 0, 1)
)
),
List.of(
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.VILLAGER, BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE, BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.SETTLEMENT_RESIDENT, null, "blueguild", null, BannerModSettlementResidentAssignmentState.NOT_APPLICABLE),
- new BannerModSettlementResidentRecord(workerUuid, BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, workAreaUuid, "bannermod:storage_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", workAreaUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.GOVERNOR_RECRUIT, BannerModSettlementResidentScheduleSeed.GOVERNING, BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY, BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.SETTLEMENT_RESIDENT, UUID.randomUUID(), "blueguild", null, BannerModSettlementResidentAssignmentState.NOT_APPLICABLE)
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.VILLAGER, SettlementResidentScheduleSeed.SETTLEMENT_IDLE, SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, SettlementResidentRuntimeRoleState.VILLAGE_LIFE, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.SETTLEMENT_RESIDENT, null, "blueguild", null, SettlementResidentAssignmentState.NOT_APPLICABLE),
+ new SettlementResidentRecord(workerUuid, SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, workAreaUuid, "bannermod:storage_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", workAreaUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.GOVERNOR_RECRUIT, SettlementResidentScheduleSeed.GOVERNING, SettlementResidentScheduleWindowSeed.CIVIC_DAY, SettlementResidentRuntimeRoleState.GOVERNANCE, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.SETTLEMENT_RESIDENT, UUID.randomUUID(), "blueguild", null, SettlementResidentAssignmentState.NOT_APPLICABLE)
),
List.of(
- new BannerModSettlementBuildingRecord(workAreaUuid, "bannermod:storage_area", new BlockPos(12, 64, 12), UUID.randomUUID(), "blueguild", 4, 1, 1, List.of(workerUuid), true, 2, 54, true, false, List.of("farmers", "merchants"))
+ new SettlementBuildingRecord(workAreaUuid, "bannermod:storage_area", new BlockPos(12, 64, 12), UUID.randomUUID(), "blueguild", 4, 1, 1, List.of(workerUuid), true, 2, 54, true, false, List.of("farmers", "merchants"))
)
);
- BannerModSettlementManager manager = new BannerModSettlementManager();
+ SettlementManager manager = new SettlementManager();
manager.putSnapshot(original);
CompoundTag persisted = manager.save(new CompoundTag(), null);
- BannerModSettlementManager reloaded = BannerModSettlementManager.load(persisted, null);
- BannerModSettlementSnapshot restored = reloaded.getSnapshot(claim.getUUID());
+ SettlementManager reloaded = SettlementManager.load(persisted, null);
+ SettlementSnapshot restored = reloaded.getSnapshot(claim.getUUID());
assertNotNull(restored);
assertEquals(claim.getUUID(), restored.claimUuid());
@@ -114,9 +114,9 @@ void managerRoundTripsResidentAndBuildingSeedDataByClaimUuid() {
assertEquals(original.missingWorkAreaAssignmentCount(), restored.missingWorkAreaAssignmentCount());
assertEquals(original.stockpileSummary(), restored.stockpileSummary());
assertEquals(original.marketState(), restored.marketState());
- assertEquals(original.desiredGoodsSeed(), restored.desiredGoodsSeed());
- assertEquals(original.projectCandidateSeed(), restored.projectCandidateSeed());
- assertEquals(original.tradeRouteHandoffSeed(), restored.tradeRouteHandoffSeed());
+ assertEquals(original.desiredGoodsSnapshot(), restored.desiredGoodsSnapshot());
+ assertEquals(original.projectCandidateSnapshot(), restored.projectCandidateSnapshot());
+ assertEquals(original.tradeRouteHandoffSnapshot(), restored.tradeRouteHandoffSnapshot());
assertEquals(original.supplySignalState(), restored.supplySignalState());
assertEquals(original.residents(), restored.residents());
assertEquals(original.buildings(), restored.buildings());
@@ -128,9 +128,9 @@ void pruneMissingClaimsRemovesStaleSnapshots() {
RecruitsClaim keptClaim = claim(new ChunkPos(2, 2), "blueguild");
RecruitsClaim staleClaim = claim(new ChunkPos(3, 3), "blueguild");
- BannerModSettlementManager manager = new BannerModSettlementManager();
- manager.putSnapshot(BannerModSettlementSnapshot.create(keptClaim.getUUID(), keptClaim.getCenter(), ownerKey(keptClaim)));
- manager.putSnapshot(BannerModSettlementSnapshot.create(staleClaim.getUUID(), staleClaim.getCenter(), ownerKey(staleClaim)));
+ SettlementManager manager = new SettlementManager();
+ manager.putSnapshot(SettlementSnapshot.create(keptClaim.getUUID(), keptClaim.getCenter(), ownerKey(keptClaim)));
+ manager.putSnapshot(SettlementSnapshot.create(staleClaim.getUUID(), staleClaim.getCenter(), ownerKey(staleClaim)));
manager.pruneMissingClaims(Set.of(keptClaim.getUUID()));
@@ -141,10 +141,10 @@ void pruneMissingClaimsRemovesStaleSnapshots() {
@Test
void putSnapshotDoesNotMarkSavedDataDirtyWhenSnapshotIsUnchanged() {
RecruitsClaim claim = claim(new ChunkPos(4, 4), "blueguild");
- BannerModSettlementSnapshot snapshot = BannerModSettlementSnapshot.create(claim.getUUID(), claim.getCenter(), ownerKey(claim));
- BannerModSettlementManager manager = new BannerModSettlementManager();
+ SettlementSnapshot snapshot = SettlementSnapshot.create(claim.getUUID(), claim.getCenter(), ownerKey(claim));
+ SettlementManager manager = new SettlementManager();
manager.putSnapshot(snapshot);
- BannerModSettlementManager reloaded = BannerModSettlementManager.load(manager.save(new CompoundTag(), null), null);
+ SettlementManager reloaded = SettlementManager.load(manager.save(new CompoundTag(), null), null);
reloaded.putSnapshot(snapshot);
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestratorTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestratorTest.java
index adfc3693..ec38b3bc 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestratorTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementOrchestratorTest.java
@@ -21,7 +21,7 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class BannerModSettlementOrchestratorTest {
+class SettlementOrchestratorTest {
private static final UUID CLAIM = UUID.fromString("00000000-0000-0000-0000-0000000000f1");
private static final UUID RESIDENT = UUID.fromString("00000000-0000-0000-0000-0000000000a1");
@@ -35,17 +35,17 @@ void tickSnapshotComposesGrowthProjectsHomesSellerDispatchGoalsAndSkipsJobsOutsi
RecordingJobHandler handler = new RecordingJobHandler();
JobHandlerRegistry registry = new JobHandlerRegistry();
registry.register(handler);
- BannerModSettlementOrchestrator.LevelRuntimeState state = BannerModSettlementOrchestrator.detachedStateForTests(registry);
- BannerModSettlementSnapshot snapshot = settlementSnapshot(NIGHT_TICK, true);
+ SettlementOrchestrator.LevelRuntimeState state = SettlementOrchestrator.detachedStateForTests(registry);
+ SettlementSnapshot snapshot = settlementSnapshot(NIGHT_TICK, true);
- BannerModSettlementOrchestrator.tickSnapshot(state, snapshot, null, NIGHT_TICK);
+ SettlementOrchestrator.tickSnapshot(state, snapshot, null, NIGHT_TICK);
assertEquals(HOME, state.homeRuntime.homeFor(RESIDENT).orElseThrow().homeBuildingUuid());
assertTrue(state.sellerRuntime.phase(RESIDENT).isPresent(), "ready seller seed should start a live dispatch");
List<PendingProject> queuedProjects = state.projectRuntime.snapshot(CLAIM);
assertFalse(queuedProjects.isEmpty(), "growth scoring should feed the project runtime queue");
- assertEquals(BannerModSettlementBuildingProfileSeed.GENERAL, queuedProjects.get(0).profileSeed());
+ assertEquals(SettlementBuildingProfileSeed.GENERAL, queuedProjects.get(0).profileSeed());
Optional<ResidentTask> task = state.goalScheduler.currentTask(RESIDENT);
assertTrue(task.isPresent(), "resident should receive a scheduled task");
@@ -59,12 +59,12 @@ void tickSnapshotRunsJobsDuringWorkGoalAndRespectsHandlerCooldown() {
RecordingJobHandler handler = new RecordingJobHandler(20);
JobHandlerRegistry registry = new JobHandlerRegistry();
registry.register(handler);
- BannerModSettlementOrchestrator.LevelRuntimeState state = BannerModSettlementOrchestrator.detachedStateForTests(registry);
- BannerModSettlementSnapshot snapshot = settlementSnapshot(DAY_TICK, false);
+ SettlementOrchestrator.LevelRuntimeState state = SettlementOrchestrator.detachedStateForTests(registry);
+ SettlementSnapshot snapshot = settlementSnapshot(DAY_TICK, false);
- BannerModSettlementOrchestrator.tickSnapshot(state, snapshot, null, DAY_TICK);
- BannerModSettlementOrchestrator.tickSnapshot(state, snapshot, null, DAY_TICK + 5);
- BannerModSettlementOrchestrator.tickSnapshot(state, snapshot, null, DAY_TICK + 20);
+ SettlementOrchestrator.tickSnapshot(state, snapshot, null, DAY_TICK);
+ SettlementOrchestrator.tickSnapshot(state, snapshot, null, DAY_TICK + 5);
+ SettlementOrchestrator.tickSnapshot(state, snapshot, null, DAY_TICK + 20);
Optional<ResidentTask> task = state.goalScheduler.currentTask(RESIDENT);
assertTrue(task.isPresent(), "resident should receive a scheduled task");
@@ -76,27 +76,27 @@ void tickSnapshotRunsJobsDuringWorkGoalAndRespectsHandlerCooldown() {
@Test
void tickSnapshotCancelsStaleLiveDispatchesAndRebindsSellerToCurrentSeed() {
- BannerModSettlementOrchestrator.LevelRuntimeState state = BannerModSettlementOrchestrator.detachedStateForTests(JobHandlerRegistry.defaults());
+ SettlementOrchestrator.LevelRuntimeState state = SettlementOrchestrator.detachedStateForTests(JobHandlerRegistry.defaults());
- BannerModSettlementOrchestrator.tickSnapshot(state, settlementSnapshot(NIGHT_TICK, true), null, NIGHT_TICK);
+ SettlementOrchestrator.tickSnapshot(state, settlementSnapshot(NIGHT_TICK, true), null, NIGHT_TICK);
UUID otherMarket = UUID.fromString("00000000-0000-0000-0000-0000000000c2");
- BannerModSettlementMarketState reboundMarketState = new BannerModSettlementMarketState(
+ SettlementMarketState reboundMarketState = new SettlementMarketState(
1,
1,
16,
8,
1,
1,
- List.of(new BannerModSettlementMarketRecord(otherMarket, "Other Market", true, 16, 8)),
- List.of(new BannerModSettlementSellerDispatchRecord(
+ List.of(new SettlementMarketRecord(otherMarket, "Other Market", true, 16, 8)),
+ List.of(new SettlementSellerDispatchRecord(
RESIDENT,
otherMarket,
"Other Market",
- BannerModSettlementSellerDispatchState.READY
+ SettlementSellerDispatchState.READY
))
);
- BannerModSettlementSnapshot reboundSnapshot = new BannerModSettlementSnapshot(
+ SettlementSnapshot reboundSnapshot = new SettlementSnapshot(
CLAIM,
0,
0,
@@ -108,17 +108,17 @@ void tickSnapshotCancelsStaleLiveDispatchesAndRebindsSellerToCurrentSeed() {
1,
1,
0,
- BannerModSettlementStockpileSummary.empty(),
+ SettlementStockpileSummary.empty(),
reboundMarketState,
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
settlementSnapshot(NIGHT_TICK, true).residents(),
settlementSnapshot(NIGHT_TICK, true).buildings()
);
- BannerModSettlementOrchestrator.tickSnapshot(state, reboundSnapshot, null, NIGHT_TICK + 1);
+ SettlementOrchestrator.tickSnapshot(state, reboundSnapshot, null, NIGHT_TICK + 1);
assertEquals(otherMarket, state.sellerRuntime.phase(RESIDENT).orElseThrow().marketRecordUuid());
assertEquals(com.talhanation.bannermod.settlement.dispatch.SellerPhase.MOVING_TO_STALL, state.sellerRuntime.phase(RESIDENT).orElseThrow().phase());
@@ -126,9 +126,9 @@ void tickSnapshotCancelsStaleLiveDispatchesAndRebindsSellerToCurrentSeed() {
@Test
void tickSnapshotFeedsReservationAwareHintsIntoGrowthQueue() {
- BannerModSettlementOrchestrator.LevelRuntimeState state = BannerModSettlementOrchestrator.detachedStateForTests(JobHandlerRegistry.defaults());
- BannerModSettlementSnapshot base = settlementSnapshot(NIGHT_TICK, true);
- BannerModSettlementSnapshot hintedSnapshot = new BannerModSettlementSnapshot(
+ SettlementOrchestrator.LevelRuntimeState state = SettlementOrchestrator.detachedStateForTests(JobHandlerRegistry.defaults());
+ SettlementSnapshot base = settlementSnapshot(NIGHT_TICK, true);
+ SettlementSnapshot hintedSnapshot = new SettlementSnapshot(
base.claimUuid(),
0,
0,
@@ -140,37 +140,37 @@ void tickSnapshotFeedsReservationAwareHintsIntoGrowthQueue() {
1,
0,
0,
- BannerModSettlementStockpileSummary.empty(),
+ SettlementStockpileSummary.empty(),
base.marketState(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- new BannerModSettlementTradeRouteHandoffSeed(
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ new SettlementTradeRouteHandoffSnapshot(
1,
1,
0,
0,
2,
12,
- List.of(new BannerModSettlementDesiredGoodSeed("market_goods", 0)),
+ List.of(new SettlementDesiredGoodSnapshot("market_goods", 0)),
List.of(),
List.of()
),
- new BannerModSettlementSupplySignalState(
+ new SettlementSupplySignalState(
1,
0,
0,
8,
- List.of(new BannerModSettlementSupplySignal("market_goods", 0, 0, 0, 8))
+ List.of(new SettlementSupplySignal("market_goods", 0, 0, 0, 8))
),
base.residents(),
base.buildings()
);
- BannerModSettlementOrchestrator.tickSnapshot(state, hintedSnapshot, null, NIGHT_TICK);
+ SettlementOrchestrator.tickSnapshot(state, hintedSnapshot, null, NIGHT_TICK);
List<PendingProject> queuedProjects = state.projectRuntime.snapshot(CLAIM);
assertFalse(queuedProjects.isEmpty(), "reservation-aware hint snapshot should drive live project scoring");
- assertEquals(BannerModSettlementBuildingProfileSeed.MARKET, queuedProjects.get(0).profileSeed());
+ assertEquals(SettlementBuildingProfileSeed.MARKET, queuedProjects.get(0).profileSeed());
}
@Test
@@ -178,11 +178,11 @@ void batchSnapshotOrderIsSortedOncePerMaintenanceCycle() {
UUID first = UUID.fromString("00000000-0000-0000-0000-000000000001");
UUID second = UUID.fromString("00000000-0000-0000-0000-000000000002");
UUID third = UUID.fromString("00000000-0000-0000-0000-000000000003");
- BannerModSettlementManager manager = new BannerModSettlementManager();
- BannerModSettlementSnapshot base = settlementSnapshot(DAY_TICK, false);
+ SettlementManager manager = new SettlementManager();
+ SettlementSnapshot base = settlementSnapshot(DAY_TICK, false);
manager.putSnapshot(withClaim(base, third));
manager.putSnapshot(withClaim(base, first));
- BannerModSettlementOrchestrator.LevelRuntimeState state = BannerModSettlementOrchestrator.detachedStateForTests(JobHandlerRegistry.defaults());
+ SettlementOrchestrator.LevelRuntimeState state = SettlementOrchestrator.detachedStateForTests(JobHandlerRegistry.defaults());
List<UUID> firstBatchOrder = state.snapshotOrderForBatch(manager, 0);
manager.putSnapshot(withClaim(base, second));
@@ -199,35 +199,35 @@ void claimTickServicePreservesSnapshotTickComposition() {
RecordingJobHandler handler = new RecordingJobHandler();
JobHandlerRegistry registry = new JobHandlerRegistry();
registry.register(handler);
- BannerModSettlementOrchestrator.LevelRuntimeState state = BannerModSettlementOrchestrator.detachedStateForTests(registry);
+ SettlementOrchestrator.LevelRuntimeState state = SettlementOrchestrator.detachedStateForTests(registry);
- BannerModSettlementClaimTickService.tickSnapshot(state, settlementSnapshot(NIGHT_TICK, true), null, null, NIGHT_TICK);
+ SettlementClaimTickService.tickSnapshot(state, settlementSnapshot(NIGHT_TICK, true), null, null, NIGHT_TICK);
assertEquals(HOME, state.homeRuntime.homeFor(RESIDENT).orElseThrow().homeBuildingUuid());
assertTrue(state.sellerRuntime.phase(RESIDENT).isPresent());
assertFalse(state.projectRuntime.snapshot(CLAIM).isEmpty());
}
- private static BannerModSettlementSnapshot settlementSnapshot(long gameTime, boolean includeSellerDispatch) {
- BannerModSettlementResidentServiceContract serviceContract = new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE,
+ private static SettlementSnapshot settlementSnapshot(long gameTime, boolean includeSellerDispatch) {
+ SettlementResidentServiceContract serviceContract = new SettlementResidentServiceContract(
+ SettlementServiceActorState.LOCAL_BUILDING_SERVICE,
MARKET,
"market_area"
);
- BannerModSettlementResidentRecord resident = new BannerModSettlementResidentRecord(
+ SettlementResidentRecord resident = new SettlementResidentRecord(
RESIDENT,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
serviceContract,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.fromString("00000000-0000-0000-0000-0000000000d1"),
"teamA",
MARKET,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
);
- BannerModSettlementBuildingRecord home = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord home = new SettlementBuildingRecord(
HOME,
"house",
BlockPos.ZERO,
@@ -238,7 +238,7 @@ private static BannerModSettlementSnapshot settlementSnapshot(long gameTime, boo
0,
List.of()
);
- BannerModSettlementBuildingRecord market = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord market = new SettlementBuildingRecord(
MARKET,
"market_area",
new BlockPos(4, 64, 4),
@@ -250,25 +250,25 @@ private static BannerModSettlementSnapshot settlementSnapshot(long gameTime, boo
List.of()
);
- BannerModSettlementMarketState marketState = new BannerModSettlementMarketState(
+ SettlementMarketState marketState = new SettlementMarketState(
1,
1,
16,
8,
1,
1,
- List.of(new BannerModSettlementMarketRecord(MARKET, "Market", true, 16, 8)),
+ List.of(new SettlementMarketRecord(MARKET, "Market", true, 16, 8)),
includeSellerDispatch
- ? List.of(new BannerModSettlementSellerDispatchRecord(
+ ? List.of(new SettlementSellerDispatchRecord(
RESIDENT,
MARKET,
"Market",
- BannerModSettlementSellerDispatchState.READY
+ SettlementSellerDispatchState.READY
))
: List.of()
);
- return new BannerModSettlementSnapshot(
+ return new SettlementSnapshot(
CLAIM,
0,
0,
@@ -280,19 +280,19 @@ private static BannerModSettlementSnapshot settlementSnapshot(long gameTime, boo
1,
1,
0,
- BannerModSettlementStockpileSummary.empty(),
+ SettlementStockpileSummary.empty(),
marketState,
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(resident),
List.of(home, market)
);
}
- private static BannerModSettlementSnapshot withClaim(BannerModSettlementSnapshot base, UUID claimUuid) {
- return new BannerModSettlementSnapshot(
+ private static SettlementSnapshot withClaim(SettlementSnapshot base, UUID claimUuid) {
+ return new SettlementSnapshot(
claimUuid,
base.anchorChunkX(),
base.anchorChunkZ(),
@@ -306,9 +306,9 @@ private static BannerModSettlementSnapshot withClaim(BannerModSettlementSnapshot
base.missingWorkAreaAssignmentCount(),
base.stockpileSummary(),
base.marketState(),
- base.desiredGoodsSeed(),
- base.projectCandidateSeed(),
- base.tradeRouteHandoffSeed(),
+ base.desiredGoodsSnapshot(),
+ base.projectCandidateSnapshot(),
+ base.tradeRouteHandoffSnapshot(),
base.supplySignalState(),
base.residents(),
base.buildings()
@@ -335,8 +335,8 @@ public ResourceLocation id() {
}
@Override
- public BannerModSettlementJobHandlerSeed handles() {
- return BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR;
+ public SettlementJobHandlerSeed handles() {
+ return SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR;
}
@Override
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecordTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecordTest.java
index 8a1bc24e..fa427c09 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecordTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentRecordTest.java
@@ -7,33 +7,33 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
-class BannerModSettlementResidentRecordTest {
+class SettlementResidentRecordTest {
@Test
void residentRecordRoundTripsScheduleSeed() {
- BannerModSettlementResidentRecord original = new BannerModSettlementResidentRecord(
+ SettlementResidentRecord original = new SettlementResidentRecord(
UUID.randomUUID(),
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- new BannerModSettlementResidentServiceContract(BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE, UUID.randomUUID(), "bannermod:crop_area"),
- new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, UUID.randomUUID(), "bannermod:crop_area", BannerModSettlementBuildingCategory.FOOD, BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION),
- new BannerModSettlementResidentJobTargetSelectionSeed(BannerModSettlementJobTargetSelectionMode.SERVICE_BUILDING, null, null),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentScheduleWindowSeed.LABOR_DAY,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ new SettlementResidentServiceContract(SettlementServiceActorState.LOCAL_BUILDING_SERVICE, UUID.randomUUID(), "bannermod:crop_area"),
+ new SettlementResidentJobDefinition(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, UUID.randomUUID(), "bannermod:crop_area", SettlementBuildingCategory.FOOD, SettlementBuildingProfileSeed.FOOD_PRODUCTION),
+ new SettlementResidentJobTargetSelectionState(SettlementJobTargetSelectionMode.SERVICE_BUILDING, null, null),
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.randomUUID(),
"blueguild",
UUID.randomUUID(),
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING,
- BannerModSettlementResidentRoleProfile.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING,
+ SettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
)
);
- BannerModSettlementResidentRecord restored = BannerModSettlementResidentRecord.fromTag(original.toTag());
+ SettlementResidentRecord restored = SettlementResidentRecord.fromTag(original.toTag());
assertEquals(original, restored);
}
@@ -44,82 +44,82 @@ void residentRecordDefaultsLegacyScheduleSeedsWhenMissing() {
UUID workAreaUuid = UUID.randomUUID();
CompoundTag workerTag = new CompoundTag();
workerTag.putUUID("ResidentUuid", workerUuid);
- workerTag.putString("Role", BannerModSettlementResidentRole.CONTROLLED_WORKER.name());
+ workerTag.putString("Role", SettlementResidentRole.CONTROLLED_WORKER.name());
workerTag.putUUID("OwnerUuid", UUID.randomUUID());
workerTag.putUUID("BoundWorkAreaUuid", workAreaUuid);
- BannerModSettlementResidentRecord worker = BannerModSettlementResidentRecord.fromTag(workerTag);
+ SettlementResidentRecord worker = SettlementResidentRecord.fromTag(workerTag);
- assertEquals(BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, worker.scheduleSeed());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, worker.scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, worker.runtimeRoleSeed());
+ assertEquals(SettlementResidentScheduleSeed.ASSIGNED_WORK, worker.scheduleSeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.LABOR_DAY, worker.scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.LOCAL_LABOR, worker.runtimeRoleState());
assertEquals("projected_local_labor", worker.roleProfile().profileId());
assertEquals("labor", worker.roleProfile().goalDomainId());
assertEquals(true, worker.roleProfile().prefersLocalBuilding());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY, worker.schedulePolicy().policySeed());
- assertEquals(BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, worker.schedulePolicy().scheduleSeed());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, worker.schedulePolicy().scheduleWindowSeed());
+ assertEquals(SettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY, worker.schedulePolicy().policySeed());
+ assertEquals(SettlementResidentScheduleSeed.ASSIGNED_WORK, worker.schedulePolicy().scheduleSeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.LABOR_DAY, worker.schedulePolicy().scheduleWindowSeed());
assertEquals("labor", worker.schedulePolicy().goalDomainId());
assertEquals(true, worker.schedulePolicy().prefersLocalBuilding());
- assertEquals(BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE, worker.serviceContract().actorState());
+ assertEquals(SettlementServiceActorState.LOCAL_BUILDING_SERVICE, worker.serviceContract().actorState());
assertEquals(workAreaUuid, worker.serviceContract().serviceBuildingUuid());
- assertEquals(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, worker.jobDefinition().handlerSeed());
+ assertEquals(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, worker.jobDefinition().handlerSeed());
assertEquals(workAreaUuid, worker.jobDefinition().targetBuildingUuid());
- assertEquals(BannerModSettlementJobTargetSelectionMode.SERVICE_BUILDING, worker.jobTargetSelectionSeed().selectionMode());
- assertEquals(BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, worker.residentMode());
- assertEquals(BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, worker.assignmentState());
+ assertEquals(SettlementJobTargetSelectionMode.SERVICE_BUILDING, worker.jobTargetSelectionState().selectionMode());
+ assertEquals(SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, worker.residentMode());
+ assertEquals(SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, worker.assignmentState());
CompoundTag governorTag = new CompoundTag();
governorTag.putUUID("ResidentUuid", UUID.randomUUID());
- governorTag.putString("Role", BannerModSettlementResidentRole.GOVERNOR_RECRUIT.name());
+ governorTag.putString("Role", SettlementResidentRole.GOVERNOR_RECRUIT.name());
- BannerModSettlementResidentRecord governor = BannerModSettlementResidentRecord.fromTag(governorTag);
+ SettlementResidentRecord governor = SettlementResidentRecord.fromTag(governorTag);
- assertEquals(BannerModSettlementResidentScheduleSeed.GOVERNING, governor.scheduleSeed());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY, governor.scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE, governor.runtimeRoleSeed());
+ assertEquals(SettlementResidentScheduleSeed.GOVERNING, governor.scheduleSeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.CIVIC_DAY, governor.scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.GOVERNANCE, governor.runtimeRoleState());
assertEquals("governance", governor.roleProfile().profileId());
assertEquals("governance", governor.roleProfile().goalDomainId());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC, governor.schedulePolicy().policySeed());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY, governor.schedulePolicy().scheduleWindowSeed());
- assertEquals(BannerModSettlementServiceActorState.NOT_SERVICE_ACTOR, governor.serviceContract().actorState());
- assertEquals(BannerModSettlementJobHandlerSeed.GOVERNANCE, governor.jobDefinition().handlerSeed());
- assertEquals(BannerModSettlementJobTargetSelectionMode.NONE, governor.jobTargetSelectionSeed().selectionMode());
- assertEquals(BannerModSettlementResidentMode.SETTLEMENT_RESIDENT, governor.residentMode());
- assertEquals(BannerModSettlementResidentAssignmentState.NOT_APPLICABLE, governor.assignmentState());
+ assertEquals(SettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC, governor.schedulePolicy().policySeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.CIVIC_DAY, governor.schedulePolicy().scheduleWindowSeed());
+ assertEquals(SettlementServiceActorState.NOT_SERVICE_ACTOR, governor.serviceContract().actorState());
+ assertEquals(SettlementJobHandlerSeed.GOVERNANCE, governor.jobDefinition().handlerSeed());
+ assertEquals(SettlementJobTargetSelectionMode.NONE, governor.jobTargetSelectionState().selectionMode());
+ assertEquals(SettlementResidentMode.SETTLEMENT_RESIDENT, governor.residentMode());
+ assertEquals(SettlementResidentAssignmentState.NOT_APPLICABLE, governor.assignmentState());
CompoundTag unownedWorkerTag = new CompoundTag();
unownedWorkerTag.putUUID("ResidentUuid", UUID.randomUUID());
- unownedWorkerTag.putString("Role", BannerModSettlementResidentRole.CONTROLLED_WORKER.name());
+ unownedWorkerTag.putString("Role", SettlementResidentRole.CONTROLLED_WORKER.name());
- BannerModSettlementResidentRecord unownedWorker = BannerModSettlementResidentRecord.fromTag(unownedWorkerTag);
+ SettlementResidentRecord unownedWorker = SettlementResidentRecord.fromTag(unownedWorkerTag);
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, unownedWorker.scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR, unownedWorker.runtimeRoleSeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, unownedWorker.scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.FLOATING_LABOR, unownedWorker.runtimeRoleState());
assertEquals("projected_floating_labor", unownedWorker.roleProfile().profileId());
assertEquals("labor", unownedWorker.roleProfile().goalDomainId());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX, unownedWorker.schedulePolicy().policySeed());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, unownedWorker.schedulePolicy().scheduleWindowSeed());
- assertEquals(BannerModSettlementServiceActorState.FLOATING_SERVICE, unownedWorker.serviceContract().actorState());
- assertEquals(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL, unownedWorker.jobDefinition().handlerSeed());
- assertEquals(BannerModSettlementJobTargetSelectionMode.FLOATING_LABOR_POOL, unownedWorker.jobTargetSelectionSeed().selectionMode());
- assertEquals(BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, unownedWorker.residentMode());
- assertEquals(BannerModSettlementResidentAssignmentState.UNASSIGNED, unownedWorker.assignmentState());
+ assertEquals(SettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX, unownedWorker.schedulePolicy().policySeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, unownedWorker.schedulePolicy().scheduleWindowSeed());
+ assertEquals(SettlementServiceActorState.FLOATING_SERVICE, unownedWorker.serviceContract().actorState());
+ assertEquals(SettlementJobHandlerSeed.FLOATING_LABOR_POOL, unownedWorker.jobDefinition().handlerSeed());
+ assertEquals(SettlementJobTargetSelectionMode.FLOATING_LABOR_POOL, unownedWorker.jobTargetSelectionState().selectionMode());
+ assertEquals(SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, unownedWorker.residentMode());
+ assertEquals(SettlementResidentAssignmentState.UNASSIGNED, unownedWorker.assignmentState());
}
@Test
void residentRecordFallsBackForUnknownScheduleWindowSeed() {
CompoundTag residentTag = new CompoundTag();
residentTag.putUUID("ResidentUuid", UUID.randomUUID());
- residentTag.putString("Role", BannerModSettlementResidentRole.VILLAGER.name());
- residentTag.putString("ScheduleSeed", BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE.name());
- residentTag.putString("RuntimeRoleSeed", BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE.name());
+ residentTag.putString("Role", SettlementResidentRole.VILLAGER.name());
+ residentTag.putString("ScheduleSeed", SettlementResidentScheduleSeed.SETTLEMENT_IDLE.name());
+ residentTag.putString("RuntimeRoleSeed", SettlementResidentRuntimeRoleState.VILLAGE_LIFE.name());
residentTag.putString("ScheduleWindowSeed", "NOT_A_REAL_WINDOW");
- BannerModSettlementResidentRecord resident = BannerModSettlementResidentRecord.fromTag(residentTag);
+ SettlementResidentRecord resident = SettlementResidentRecord.fromTag(residentTag);
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, resident.scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX, resident.schedulePolicy().policySeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, resident.scheduleWindowSeed());
+ assertEquals(SettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX, resident.schedulePolicy().policySeed());
}
@Test
@@ -127,14 +127,14 @@ void residentRecordFallsBackForUnknownScheduleSeed() {
UUID workAreaUuid = UUID.randomUUID();
CompoundTag residentTag = new CompoundTag();
residentTag.putUUID("ResidentUuid", UUID.randomUUID());
- residentTag.putString("Role", BannerModSettlementResidentRole.CONTROLLED_WORKER.name());
+ residentTag.putString("Role", SettlementResidentRole.CONTROLLED_WORKER.name());
residentTag.putUUID("BoundWorkAreaUuid", workAreaUuid);
residentTag.putString("ScheduleSeed", "NOT_A_REAL_SCHEDULE");
- BannerModSettlementResidentRecord resident = BannerModSettlementResidentRecord.fromTag(residentTag);
+ SettlementResidentRecord resident = SettlementResidentRecord.fromTag(residentTag);
- assertEquals(BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, resident.scheduleSeed());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY, resident.schedulePolicy().policySeed());
+ assertEquals(SettlementResidentScheduleSeed.ASSIGNED_WORK, resident.scheduleSeed());
+ assertEquals(SettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY, resident.schedulePolicy().policySeed());
}
@Test
@@ -142,9 +142,9 @@ void schedulePolicyFallsBackForUnknownScheduleSeed() {
CompoundTag policyTag = new CompoundTag();
policyTag.putString("ScheduleSeed", "NOT_A_REAL_SCHEDULE");
- BannerModSettlementResidentSchedulePolicy policy = BannerModSettlementResidentSchedulePolicy.fromTag(policyTag);
+ SettlementResidentSchedulePolicy policy = SettlementResidentSchedulePolicy.fromTag(policyTag);
- assertEquals(BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE, policy.scheduleSeed());
+ assertEquals(SettlementResidentScheduleSeed.SETTLEMENT_IDLE, policy.scheduleSeed());
}
@Test
@@ -154,8 +154,8 @@ void sellerDispatchRecordFallsBackForUnknownDispatchState() {
dispatchTag.putUUID("MarketUuid", UUID.randomUUID());
dispatchTag.putString("DispatchState", "NOT_A_REAL_STATE");
- BannerModSettlementSellerDispatchRecord dispatch = BannerModSettlementSellerDispatchRecord.fromTag(dispatchTag);
+ SettlementSellerDispatchRecord dispatch = SettlementSellerDispatchRecord.fromTag(dispatchTag);
- assertEquals(BannerModSettlementSellerDispatchState.READY, dispatch.dispatchState());
+ assertEquals(SettlementSellerDispatchState.READY, dispatch.dispatchState());
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentStaffingServiceTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentStaffingServiceTest.java
new file mode 100644
index 00000000..d4adf20f
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementResidentStaffingServiceTest.java
@@ -0,0 +1,77 @@
+package com.talhanation.bannermod.settlement;
+
+import net.minecraft.core.BlockPos;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class SettlementResidentStaffingServiceTest {
+
+ @Test
+ void appliesResidentAssignmentSemanticsAndRollsAssignedWorkersIntoBuildings() {
+ UUID localBuildingUuid = UUID.randomUUID();
+ UUID assignedWorkerUuid = UUID.randomUUID();
+
+ SettlementResidentStaffingService.StaffingResult staffing = SettlementResidentStaffingService.apply(
+ List.of(
+ new SettlementResidentRecord(assignedWorkerUuid, SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.FLOATING_LABOR, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", localBuildingUuid, SettlementResidentAssignmentState.UNASSIGNED),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.SETTLEMENT_IDLE, SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, SettlementResidentRuntimeRoleState.FLOATING_LABOR, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", null, SettlementResidentAssignmentState.UNASSIGNED),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.FLOATING_LABOR, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", UUID.randomUUID(), SettlementResidentAssignmentState.UNASSIGNED),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.VILLAGER, SettlementResidentScheduleSeed.SETTLEMENT_IDLE, SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, SettlementResidentRuntimeRoleState.VILLAGE_LIFE, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.SETTLEMENT_RESIDENT, null, "blueguild", null, SettlementResidentAssignmentState.NOT_APPLICABLE)
+ ),
+ List.of(new SettlementBuildingRecord(localBuildingUuid, "bannermod:crop_area", new BlockPos(12, 64, 12), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())),
+ SettlementMarketState.empty(),
+ Set.of(localBuildingUuid)
+ );
+ List<SettlementResidentRecord> residents = staffing.residents();
+ List<SettlementBuildingRecord> buildings = staffing.buildings();
+
+ assertEquals(SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, residents.get(0).assignmentState());
+ assertEquals(SettlementResidentScheduleWindowSeed.LABOR_DAY, residents.get(0).scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.LOCAL_LABOR, residents.get(0).runtimeRoleState());
+ assertEquals("projected_local_labor", residents.get(0).roleProfile().profileId());
+ assertEquals("labor", residents.get(0).roleProfile().goalDomainId());
+ assertEquals(SettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY, residents.get(0).schedulePolicy().policySeed());
+ assertEquals(SettlementResidentScheduleWindowSeed.LABOR_DAY, residents.get(0).schedulePolicy().scheduleWindowSeed());
+ assertEquals(SettlementServiceActorState.LOCAL_BUILDING_SERVICE, residents.get(0).serviceContract().actorState());
+ assertEquals(localBuildingUuid, residents.get(0).serviceContract().serviceBuildingUuid());
+ assertEquals("bannermod:crop_area", residents.get(0).serviceContract().serviceBuildingTypeId());
+ assertEquals(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, residents.get(0).jobDefinition().handlerSeed());
+ assertEquals(SettlementBuildingCategory.FOOD, residents.get(0).jobDefinition().targetBuildingCategory());
+ assertEquals(SettlementBuildingProfileSeed.FOOD_PRODUCTION, residents.get(0).jobDefinition().targetBuildingProfileSeed());
+ assertEquals(SettlementJobTargetSelectionMode.SERVICE_BUILDING, residents.get(0).jobTargetSelectionState().selectionMode());
+ assertEquals(SettlementResidentAssignmentState.UNASSIGNED, residents.get(1).assignmentState());
+ assertEquals(SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, residents.get(1).scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.FLOATING_LABOR, residents.get(1).runtimeRoleState());
+ assertEquals("projected_floating_labor", residents.get(1).roleProfile().profileId());
+ assertEquals(SettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX, residents.get(1).schedulePolicy().policySeed());
+ assertEquals(SettlementServiceActorState.FLOATING_SERVICE, residents.get(1).serviceContract().actorState());
+ assertEquals(SettlementJobHandlerSeed.FLOATING_LABOR_POOL, residents.get(1).jobDefinition().handlerSeed());
+ assertEquals(SettlementJobTargetSelectionMode.FLOATING_LABOR_POOL, residents.get(1).jobTargetSelectionState().selectionMode());
+ assertEquals(SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING, residents.get(2).assignmentState());
+ assertEquals(SettlementResidentScheduleWindowSeed.LABOR_DAY, residents.get(2).scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.ORPHANED_LABOR_ASSIGNMENT, residents.get(2).runtimeRoleState());
+ assertEquals("orphaned_labor_assignment", residents.get(2).roleProfile().profileId());
+ assertEquals(SettlementResidentSchedulePolicySeed.ORPHANED_LABOR_DAY, residents.get(2).schedulePolicy().policySeed());
+ assertEquals(SettlementServiceActorState.ORPHANED_SERVICE, residents.get(2).serviceContract().actorState());
+ assertEquals(SettlementJobHandlerSeed.ORPHANED_LABOR_RECOVERY, residents.get(2).jobDefinition().handlerSeed());
+ assertEquals(residents.get(2).boundWorkAreaUuid(), residents.get(2).jobDefinition().targetBuildingUuid());
+ assertEquals(SettlementJobTargetSelectionMode.ORPHANED_SERVICE_BUILDING, residents.get(2).jobTargetSelectionState().selectionMode());
+ assertEquals(SettlementResidentAssignmentState.NOT_APPLICABLE, residents.get(3).assignmentState());
+ assertEquals(SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, residents.get(3).scheduleWindowSeed());
+ assertEquals(SettlementResidentRuntimeRoleState.VILLAGE_LIFE, residents.get(3).runtimeRoleState());
+ assertEquals("village_life", residents.get(3).roleProfile().profileId());
+ assertEquals(SettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX, residents.get(3).schedulePolicy().policySeed());
+ assertEquals(SettlementServiceActorState.NOT_SERVICE_ACTOR, residents.get(3).serviceContract().actorState());
+ assertEquals(SettlementJobHandlerSeed.VILLAGE_LIFE, residents.get(3).jobDefinition().handlerSeed());
+ assertEquals(SettlementJobTargetSelectionMode.NONE, residents.get(3).jobTargetSelectionState().selectionMode());
+ assertEquals(1, buildings.get(0).assignedWorkerCount());
+ assertEquals(List.of(assignedWorkerUuid), buildings.get(0).assignedResidentUuids());
+ assertEquals(SettlementBuildingCategory.FOOD, buildings.get(0).buildingCategory());
+ assertEquals(SettlementBuildingProfileSeed.FOOD_PRODUCTION, buildings.get(0).buildingProfileSeed());
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementServiceTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementServiceTest.java
deleted file mode 100644
index e1ebe34b..00000000
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementServiceTest.java
+++ /dev/null
@@ -1,1026 +0,0 @@
-package com.talhanation.bannermod.settlement;
-
-import com.talhanation.bannermod.settlement.bootstrap.SettlementRecord;
-import com.talhanation.bannermod.settlement.bootstrap.SettlementStatus;
-import com.talhanation.bannermod.settlement.building.BuildingType;
-import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
-import com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter;
-import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeExecutionRecord;
-import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeExecutionState;
-import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeSummary;
-import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.AABB;
-import org.junit.jupiter.api.Test;
-
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-class BannerModSettlementServiceTest {
-
- @Test
- void appliesResidentAssignmentSemanticsAndRollsAssignedWorkersIntoBuildings() {
- UUID localBuildingUuid = UUID.randomUUID();
- UUID assignedWorkerUuid = UUID.randomUUID();
-
- BannerModSettlementResidentStaffingService.StaffingResult staffing = BannerModSettlementResidentStaffingService.apply(
- List.of(
- new BannerModSettlementResidentRecord(assignedWorkerUuid, BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", localBuildingUuid, BannerModSettlementResidentAssignmentState.UNASSIGNED),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE, BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", null, BannerModSettlementResidentAssignmentState.UNASSIGNED),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", UUID.randomUUID(), BannerModSettlementResidentAssignmentState.UNASSIGNED),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.VILLAGER, BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE, BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.SETTLEMENT_RESIDENT, null, "blueguild", null, BannerModSettlementResidentAssignmentState.NOT_APPLICABLE)
- ),
- List.of(new BannerModSettlementBuildingRecord(localBuildingUuid, "bannermod:crop_area", new BlockPos(12, 64, 12), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())),
- BannerModSettlementMarketState.empty(),
- Set.of(localBuildingUuid)
- );
- List<BannerModSettlementResidentRecord> residents = staffing.residents();
- List<BannerModSettlementBuildingRecord> buildings = staffing.buildings();
-
- assertEquals(BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, residents.get(0).assignmentState());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, residents.get(0).scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, residents.get(0).runtimeRoleSeed());
- assertEquals("projected_local_labor", residents.get(0).roleProfile().profileId());
- assertEquals("labor", residents.get(0).roleProfile().goalDomainId());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.LOCAL_LABOR_DAY, residents.get(0).schedulePolicy().policySeed());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, residents.get(0).schedulePolicy().scheduleWindowSeed());
- assertEquals(BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE, residents.get(0).serviceContract().actorState());
- assertEquals(localBuildingUuid, residents.get(0).serviceContract().serviceBuildingUuid());
- assertEquals("bannermod:crop_area", residents.get(0).serviceContract().serviceBuildingTypeId());
- assertEquals(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, residents.get(0).jobDefinition().handlerSeed());
- assertEquals(BannerModSettlementBuildingCategory.FOOD, residents.get(0).jobDefinition().targetBuildingCategory());
- assertEquals(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, residents.get(0).jobDefinition().targetBuildingProfileSeed());
- assertEquals(BannerModSettlementJobTargetSelectionMode.SERVICE_BUILDING, residents.get(0).jobTargetSelectionSeed().selectionMode());
- assertEquals(BannerModSettlementResidentAssignmentState.UNASSIGNED, residents.get(1).assignmentState());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, residents.get(1).scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR, residents.get(1).runtimeRoleSeed());
- assertEquals("projected_floating_labor", residents.get(1).roleProfile().profileId());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX, residents.get(1).schedulePolicy().policySeed());
- assertEquals(BannerModSettlementServiceActorState.FLOATING_SERVICE, residents.get(1).serviceContract().actorState());
- assertEquals(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL, residents.get(1).jobDefinition().handlerSeed());
- assertEquals(BannerModSettlementJobTargetSelectionMode.FLOATING_LABOR_POOL, residents.get(1).jobTargetSelectionSeed().selectionMode());
- assertEquals(BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING, residents.get(2).assignmentState());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, residents.get(2).scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.ORPHANED_LABOR_ASSIGNMENT, residents.get(2).runtimeRoleSeed());
- assertEquals("orphaned_labor_assignment", residents.get(2).roleProfile().profileId());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.ORPHANED_LABOR_DAY, residents.get(2).schedulePolicy().policySeed());
- assertEquals(BannerModSettlementServiceActorState.ORPHANED_SERVICE, residents.get(2).serviceContract().actorState());
- assertEquals(BannerModSettlementJobHandlerSeed.ORPHANED_LABOR_RECOVERY, residents.get(2).jobDefinition().handlerSeed());
- assertEquals(residents.get(2).boundWorkAreaUuid(), residents.get(2).jobDefinition().targetBuildingUuid());
- assertEquals(BannerModSettlementJobTargetSelectionMode.ORPHANED_SERVICE_BUILDING, residents.get(2).jobTargetSelectionSeed().selectionMode());
- assertEquals(BannerModSettlementResidentAssignmentState.NOT_APPLICABLE, residents.get(3).assignmentState());
- assertEquals(BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, residents.get(3).scheduleWindowSeed());
- assertEquals(BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE, residents.get(3).runtimeRoleSeed());
- assertEquals("village_life", residents.get(3).roleProfile().profileId());
- assertEquals(BannerModSettlementResidentSchedulePolicySeed.VILLAGE_LIFE_FLEX, residents.get(3).schedulePolicy().policySeed());
- assertEquals(BannerModSettlementServiceActorState.NOT_SERVICE_ACTOR, residents.get(3).serviceContract().actorState());
- assertEquals(BannerModSettlementJobHandlerSeed.VILLAGE_LIFE, residents.get(3).jobDefinition().handlerSeed());
- assertEquals(BannerModSettlementJobTargetSelectionMode.NONE, residents.get(3).jobTargetSelectionSeed().selectionMode());
- assertEquals(1, buildings.get(0).assignedWorkerCount());
- assertEquals(List.of(assignedWorkerUuid), buildings.get(0).assignedResidentUuids());
- assertEquals(BannerModSettlementBuildingCategory.FOOD, buildings.get(0).buildingCategory());
- assertEquals(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, buildings.get(0).buildingProfileSeed());
- }
-
- @Test
- void summarizesAuthoredStockpileSeedsFromBuildingRecords() {
- BannerModSettlementStockpileSummary summary = BannerModSettlementService.summarizeStockpiles(List.of(
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 2, 54, true, false, List.of("farmers", "merchants")),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:storage_area", new BlockPos(10, 64, 10), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 1, 27, false, true, List.of("farmers")),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:crop_area", new BlockPos(20, 64, 20), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 99, 99, true, true, List.of("ignored"))
- ));
-
- assertEquals(2, summary.storageBuildingCount());
- assertEquals(3, summary.containerCount());
- assertEquals(81, summary.slotCapacity());
- assertEquals(1, summary.routedStorageCount());
- assertEquals(1, summary.portEntrypointCount());
- assertEquals(List.of("farmers", "merchants"), summary.authoredStorageTypeIds());
- }
-
- @Test
- void mapsValidatedHouseStorageAndWorkplaceBuildingsIntoSnapshotRecords() {
- UUID ownerUuid = UUID.randomUUID();
- BannerModSettlementBuildingRecord houseRecord = BannerModSettlementService.fromValidatedBuildingFields(UUID.randomUUID(), BuildingType.HOUSE, new BlockPos(0, 64, 0), 3, ownerUuid);
- BannerModSettlementBuildingRecord storageRecord = BannerModSettlementService.fromValidatedBuildingFields(UUID.randomUUID(), BuildingType.STORAGE, new BlockPos(8, 64, 0), 2, ownerUuid);
- BannerModSettlementBuildingRecord farmRecord = BannerModSettlementService.fromValidatedBuildingFields(UUID.randomUUID(), BuildingType.FARM, new BlockPos(16, 64, 0), 1, ownerUuid);
- BannerModSettlementStockpileSummary summary = BannerModSettlementService.summarizeStockpiles(List.of(storageRecord));
-
- assertEquals("bannermod:validated_house", houseRecord.buildingTypeId());
- assertEquals(3, houseRecord.residentCapacity());
- assertEquals(ownerUuid, houseRecord.ownerUuid());
- assertEquals("bannermod:validated_storage", storageRecord.buildingTypeId());
- assertEquals(2, summary.containerCount());
- assertEquals(54, summary.slotCapacity());
- assertEquals(BannerModSettlementBuildingProfileSeed.STORAGE, storageRecord.buildingProfileSeed());
- assertEquals("bannermod:validated_farm", farmRecord.buildingTypeId());
- assertEquals(1, farmRecord.workplaceSlots());
- assertEquals(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, farmRecord.buildingProfileSeed());
- }
-
- @Test
- void validatedBuildingLookupUsesSettlementIdInsteadOfClaimId() {
- UUID settlementId = UUID.randomUUID();
- UUID claimId = UUID.randomUUID();
- SettlementRecord settlement = new SettlementRecord(
- settlementId,
- UUID.randomUUID(),
- "faction",
- claimId,
- Level.OVERWORLD,
- BlockPos.ZERO,
- BlockPos.ZERO,
- UUID.randomUUID(),
- SettlementStatus.ACTIVE,
- 10L
- );
- ValidatedBuildingRecord matchingRecord = new ValidatedBuildingRecord(
- UUID.randomUUID(),
- settlementId,
- BuildingType.FARM,
- Level.OVERWORLD,
- new BlockPos(4, 64, 4),
- List.of(),
- new AABB(4, 64, 4, 8, 65, 8),
- null,
- 4,
- 80,
- 1L,
- 1L,
- 0L
- );
- ValidatedBuildingRecord wrongRecord = new ValidatedBuildingRecord(
- UUID.randomUUID(),
- claimId,
- BuildingType.FARM,
- Level.OVERWORLD,
- new BlockPos(4, 64, 4),
- List.of(),
- new AABB(4, 64, 4, 8, 65, 8),
- null,
- 4,
- 80,
- 1L,
- 1L,
- 0L
- );
-
- assertTrue(BannerModSettlementService.validatedBuildingBelongsToSettlement(settlement, matchingRecord));
- assertEquals(false, BannerModSettlementService.validatedBuildingBelongsToSettlement(settlement, wrongRecord));
- }
-
- @Test
- void mergesValidatedCapacityIntoLiveWorkAreaRecordWithoutBreakingBindingUuid() {
- UUID liveWorkAreaUuid = UUID.randomUUID();
- UUID settlementId = UUID.randomUUID();
- UUID ownerUuid = UUID.randomUUID();
- BlockPos origin = new BlockPos(12, 64, 12);
- ValidatedBuildingRecord record = new ValidatedBuildingRecord(
- UUID.randomUUID(),
- settlementId,
- BuildingType.FARM,
- Level.OVERWORLD,
- origin,
- List.of(),
- new AABB(12, 64, 12, 20, 65, 20),
- null,
- 4,
- 100,
- 1L,
- 1L,
- 0L
- );
- BannerModSettlementBuildingRecord liveRecord = new BannerModSettlementBuildingRecord(
- liveWorkAreaUuid,
- "bannermod:crop_area",
- origin,
- ownerUuid,
- "54ac1b4f-006f-4fcb-a48d-47f93a9f575a",
- 0,
- 1,
- 0,
- List.of()
- );
- BannerModSettlementBuildingRecord expectedValidated = BannerModSettlementService.fromValidatedBuildingFields(
- liveWorkAreaUuid,
- BuildingType.FARM,
- origin,
- 4,
- ownerUuid
- );
-
- BannerModSettlementBuildingRecord merged = BannerModSettlementService.mergeValidatedBuildingIntoLiveRecord(record, liveRecord);
-
- assertEquals(liveWorkAreaUuid, merged.buildingUuid());
- assertEquals("bannermod:crop_area", merged.buildingTypeId());
- assertEquals(expectedValidated.workplaceSlots(), merged.workplaceSlots());
- assertEquals(expectedValidated.buildingCategory(), merged.buildingCategory());
- assertEquals(expectedValidated.buildingProfileSeed(), merged.buildingProfileSeed());
- assertEquals(ownerUuid, merged.ownerUuid());
- assertEquals(liveRecord.teamId(), merged.teamId());
- }
-
- @Test
- void ignoresLegacyValidatedBuildingAssignedCitizensOnReload() {
- UUID staleWorkerUuid = UUID.randomUUID();
- CompoundTag tag = new CompoundTag();
- tag.putUUID("BuildingId", UUID.randomUUID());
- tag.putUUID("SettlementId", UUID.randomUUID());
- tag.putString("Type", BuildingType.FARM.name());
- tag.putString("Dimension", "minecraft:overworld");
- tag.putLong("AnchorPos", new BlockPos(16, 64, 0).asLong());
- tag.putString("State", "VALID");
- tag.putInt("Capacity", 1);
- tag.putInt("QualityScore", 1);
- ListTag legacyAssigned = new ListTag();
- CompoundTag legacyAssignedEntry = new CompoundTag();
- legacyAssignedEntry.putUUID("CitizenId", staleWorkerUuid);
- legacyAssigned.add(legacyAssignedEntry);
- tag.put("AssignedCitizenIds", legacyAssigned);
-
- ValidatedBuildingRecord reloaded = ValidatedBuildingRecord.fromTag(tag);
- BannerModSettlementBuildingRecord building = BannerModSettlementService.fromValidatedBuilding(reloaded, null);
-
- assertEquals(0, building.assignedWorkerCount());
- assertEquals(List.of(), building.assignedResidentUuids());
- }
-
- @Test
- void summarizesMarketStateIntoAggregateSeed() {
- List<BannerModSettlementMarketRecord> markets = List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
- );
-
- BannerModSettlementMarketState marketState = BannerModSettlementService.summarizeMarketState(markets);
-
- assertEquals(2, marketState.marketCount());
- assertEquals(1, marketState.openMarketCount());
- assertEquals(45, marketState.totalStorageSlots());
- assertEquals(13, marketState.freeStorageSlots());
- assertEquals(0, marketState.sellerDispatchCount());
- assertEquals(0, marketState.readySellerDispatchCount());
- assertEquals(markets, marketState.markets());
- assertEquals(List.of(), marketState.sellerDispatches());
- }
-
-
- @Test
- void scheduleWindowSeedDefaultsFromScheduleAndRuntimeRole() {
- assertEquals(
- BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY,
- BannerModSettlementResidentScheduleWindowSeed.defaultFor(
- BannerModSettlementResidentScheduleSeed.GOVERNING,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE
- )
- );
- assertEquals(
- BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY,
- BannerModSettlementResidentScheduleWindowSeed.defaultFor(
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.ORPHANED_LABOR_ASSIGNMENT
- )
- );
- assertEquals(
- BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
- BannerModSettlementResidentScheduleWindowSeed.defaultFor(
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE
- )
- );
- }
-
- @Test
- void schedulePolicyDefaultsFromResidentSeeds() {
- BannerModSettlementResidentRoleProfile floatingProfile = BannerModSettlementResidentRoleProfile.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
- BannerModSettlementResidentAssignmentState.UNASSIGNED
- );
-
- assertEquals(
- BannerModSettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC,
- BannerModSettlementResidentSchedulePolicy.defaultFor(
- BannerModSettlementResidentScheduleSeed.GOVERNING,
- BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentRoleProfile.defaultFor(
- BannerModSettlementResidentRole.GOVERNOR_RECRUIT,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
- )
- ).policySeed()
- );
- assertEquals(
- BannerModSettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX,
- BannerModSettlementResidentSchedulePolicy.defaultFor(
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
- BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR,
- floatingProfile
- ).policySeed()
- );
- assertEquals(
- BannerModSettlementResidentSchedulePolicySeed.ORPHANED_LABOR_DAY,
- BannerModSettlementResidentSchedulePolicy.defaultFor(
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.ORPHANED_LABOR_ASSIGNMENT,
- BannerModSettlementResidentRoleProfile.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentRuntimeRoleSeed.ORPHANED_LABOR_ASSIGNMENT,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
- BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING
- )
- ).policySeed()
- );
- }
-
- @Test
- void projectsSellerDispatchSeedFromMarketServiceContracts() {
- UUID openMarketUuid = UUID.randomUUID();
- UUID closedMarketUuid = UUID.randomUUID();
- UUID cropAreaUuid = UUID.randomUUID();
- UUID readySellerUuid = UUID.randomUUID();
- UUID blockedSellerUuid = UUID.randomUUID();
-
- BannerModSettlementMarketState marketState = BannerModSettlementService.applySellerDispatchSeed(
- BannerModSettlementService.summarizeMarketState(List.of(
- new BannerModSettlementMarketRecord(openMarketUuid, "Harbor Square", true, 27, 9),
- new BannerModSettlementMarketRecord(closedMarketUuid, "East Gate", false, 18, 4)
- )),
- List.of(
- new BannerModSettlementResidentRecord(readySellerUuid, BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, openMarketUuid, "bannermod:market_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", openMarketUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- new BannerModSettlementResidentRecord(blockedSellerUuid, BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, closedMarketUuid, "bannermod:market_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", closedMarketUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, cropAreaUuid, "bannermod:crop_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", cropAreaUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE, BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR, BannerModSettlementResidentServiceContract.notServiceActor(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", null, BannerModSettlementResidentAssignmentState.UNASSIGNED)
- ),
- List.of(
- new BannerModSettlementBuildingRecord(openMarketUuid, "bannermod:market_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(readySellerUuid), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(closedMarketUuid, "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(blockedSellerUuid), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(cropAreaUuid, "bannermod:crop_area", new BlockPos(16, 64, 16), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of())
- )
- );
-
- assertEquals(2, marketState.sellerDispatchCount());
- assertEquals(1, marketState.readySellerDispatchCount());
- assertEquals(List.of(
- new BannerModSettlementSellerDispatchRecord(readySellerUuid, openMarketUuid, "Harbor Square", BannerModSettlementSellerDispatchState.READY),
- new BannerModSettlementSellerDispatchRecord(blockedSellerUuid, closedMarketUuid, "East Gate", BannerModSettlementSellerDispatchState.MARKET_CLOSED)
- ), marketState.sellerDispatches());
-
- List<BannerModSettlementResidentRecord> residents = BannerModSettlementService.applyResidentJobTargetSelectionSeeds(
- List.of(
- new BannerModSettlementResidentRecord(readySellerUuid, BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, openMarketUuid, "bannermod:market_area"), new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, openMarketUuid, "bannermod:market_area", BannerModSettlementBuildingCategory.MARKET, BannerModSettlementBuildingProfileSeed.MARKET), BannerModSettlementResidentJobTargetSelectionSeed.none(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", openMarketUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, BannerModSettlementResidentRoleProfile.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING)),
- new BannerModSettlementResidentRecord(blockedSellerUuid, BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, closedMarketUuid, "bannermod:market_area"), new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, closedMarketUuid, "bannermod:market_area", BannerModSettlementBuildingCategory.MARKET, BannerModSettlementBuildingProfileSeed.MARKET), BannerModSettlementResidentJobTargetSelectionSeed.none(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", closedMarketUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, BannerModSettlementResidentRoleProfile.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING)),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, cropAreaUuid, "bannermod:crop_area"), new BannerModSettlementResidentJobDefinition(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, cropAreaUuid, "bannermod:crop_area", BannerModSettlementBuildingCategory.FOOD, BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION), BannerModSettlementResidentJobTargetSelectionSeed.none(), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", cropAreaUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, BannerModSettlementResidentRoleProfile.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING))
- ),
- marketState
- );
-
- assertEquals(BannerModSettlementJobTargetSelectionMode.SELLER_MARKET_DISPATCH, residents.get(0).jobTargetSelectionSeed().selectionMode());
- assertEquals(openMarketUuid, residents.get(0).jobTargetSelectionSeed().targetMarketUuid());
- assertEquals("Harbor Square", residents.get(0).jobTargetSelectionSeed().targetMarketName());
- assertEquals(BannerModSettlementJobTargetSelectionMode.SELLER_MARKET_CLOSED, residents.get(1).jobTargetSelectionSeed().selectionMode());
- assertEquals(closedMarketUuid, residents.get(1).jobTargetSelectionSeed().targetMarketUuid());
- assertEquals("East Gate", residents.get(1).jobTargetSelectionSeed().targetMarketName());
- assertEquals(BannerModSettlementJobTargetSelectionMode.SERVICE_BUILDING, residents.get(2).jobTargetSelectionSeed().selectionMode());
- }
-
- @Test
- void summarizesDesiredGoodsFromBuildingProfilesStockpileTypesAndMarkets() {
- List<BannerModSettlementBuildingRecord> buildings = List.of(
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:crop_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:mining_area", new BlockPos(10, 64, 10), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:build_area", new BlockPos(20, 64, 20), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:market_area", new BlockPos(30, 64, 30), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())
- );
-
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed = BannerModSettlementService.summarizeDesiredGoods(
- buildings,
- new BannerModSettlementStockpileSummary(1, 2, 54, 1, 0, List.of("farmers", "merchants")),
- new BannerModSettlementMarketState(2, 1, 45, 13, 0, 0, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
- ), List.of())
- );
-
- assertEquals(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 1),
- new BannerModSettlementDesiredGoodSeed("materials", 1),
- new BannerModSettlementDesiredGoodSeed("construction_materials", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 3),
- new BannerModSettlementDesiredGoodSeed("storage_type:farmers", 1),
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1),
- new BannerModSettlementDesiredGoodSeed("trade_stock", 1)
- ), desiredGoodsSeed.desiredGoods());
- }
-
- @Test
- void summarizesTradeRouteHandoffSeedFromDispatchDemandAndRouteHints() {
- BannerModSettlementMarketState marketState = new BannerModSettlementMarketState(
- 2,
- 1,
- 45,
- 13,
- 2,
- 1,
- List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
- ),
- List.of(
- new BannerModSettlementSellerDispatchRecord(UUID.randomUUID(), UUID.randomUUID(), "Harbor Square", BannerModSettlementSellerDispatchState.READY),
- new BannerModSettlementSellerDispatchRecord(UUID.randomUUID(), UUID.randomUUID(), "East Gate", BannerModSettlementSellerDispatchState.MARKET_CLOSED)
- )
- );
-
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("market_goods", 3),
- new BannerModSettlementDesiredGoodSeed("trade_stock", 1),
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1)
- ));
-
- BannerModSettlementTradeRouteHandoffSeed handoffSeed = BannerModSettlementService.summarizeTradeRouteHandoffSeed(
- new BannerModSettlementStockpileSummary(2, 3, 81, 1, 1, List.of("farmers", "merchants")),
- marketState,
- desiredGoodsSeed,
- new BannerModSettlementService.ReservationSignalSeed(2, 24, Map.of("trade_stock", 24))
- );
-
- assertEquals(2, handoffSeed.sellerDispatchCount());
- assertEquals(1, handoffSeed.readySellerDispatchCount());
- assertEquals(1, handoffSeed.routedStorageCount());
- assertEquals(1, handoffSeed.portEntrypointCount());
- assertEquals(2, handoffSeed.activeReservationCount());
- assertEquals(24, handoffSeed.reservedUnitCount());
- assertEquals(desiredGoodsSeed.desiredGoods(), handoffSeed.desiredGoods());
- assertEquals(marketState.sellerDispatches(), handoffSeed.sellerDispatches());
- }
-
- @Test
- void seaTradeStatusLinesExposeExecutionProgressAndFailures() {
- UUID sourceId = UUID.fromString("00000000-0000-0000-0000-000000003101");
- UUID destinationId = UUID.fromString("00000000-0000-0000-0000-000000003102");
- BannerModLogisticsItemFilter wheat = BannerModLogisticsItemFilter.ofItemIds(List.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat")));
-
- List<String> lines = BannerModSettlementService.seaTradeStatusLines(
- BannerModSeaTradeSummary.summarise(List.of()),
- List.of(
- seaTradeRecord("00000000-0000-0000-0000-000000003201", sourceId, destinationId, wheat, 16, 0, BannerModSeaTradeExecutionState.LOADING, ""),
- seaTradeRecord("00000000-0000-0000-0000-000000003202", sourceId, destinationId, wheat, 16, 8, BannerModSeaTradeExecutionState.TRAVELLING, ""),
- seaTradeRecord("00000000-0000-0000-0000-000000003203", sourceId, destinationId, wheat, 16, 8, BannerModSeaTradeExecutionState.UNLOADING, ""),
- seaTradeRecord("00000000-0000-0000-0000-000000003204", sourceId, destinationId, wheat, 16, 0, BannerModSeaTradeExecutionState.COMPLETE, ""),
- seaTradeRecord("00000000-0000-0000-0000-000000003205", sourceId, destinationId, wheat, 16, 0, BannerModSeaTradeExecutionState.FAILED, BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER),
- seaTradeRecord("00000000-0000-0000-0000-000000003206", sourceId, destinationId, wheat, 16, 4, BannerModSeaTradeExecutionState.FAILED, BannerModSeaTradeExecutionRecord.FAILURE_DESTINATION_FULL)
- )
- );
-
- assertEquals(List.of(
- "gui.bannermod.governor.logistics.sea_trade.loading 3201 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 0 16",
- "gui.bannermod.governor.logistics.sea_trade.travelling 3202 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 8 16",
- "gui.bannermod.governor.logistics.sea_trade.unloading 3203 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 8 16",
- "gui.bannermod.governor.logistics.sea_trade.completed 3204 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 0 16",
- "gui.bannermod.governor.logistics.sea_trade.missing_ship 3205 unassigned gui.bannermod.governor.logistics.sea_trade.reason.no_carrier minecraft:wheat 0 16",
- "gui.bannermod.governor.logistics.sea_trade.blocked_cargo 3206 2201 gui.bannermod.governor.logistics.sea_trade.reason.destination_full minecraft:wheat 4 16"
- ), lines.subList(0, 6));
- }
-
- @Test
- void seaTradeStatusLocalizationCoversSuccessfulAndBlockedRoutes() throws Exception {
- String enUs = Files.readString(Path.of("src/main/resources/assets/bannermod/lang/en_us.json"));
- String ruRu = Files.readString(Path.of("src/main/resources/assets/bannermod/lang/ru_ru.json"));
-
- for (String lang : List.of(enUs, ruRu)) {
- assertTrue(lang.contains("gui.bannermod.governor.logistics.sea_trade.completed"));
- assertTrue(lang.contains("gui.bannermod.governor.logistics.sea_trade.blocked_cargo"));
- assertTrue(lang.contains("gui.bannermod.governor.logistics.sea_trade.reason.destination_full"));
- }
- }
-
- @Test
- void summarizesSupplySignalsFromDesiredGoodsCoverageAndReservationHints() {
- UUID marketUuid = UUID.randomUUID();
- UUID cropAreaUuid = UUID.randomUUID();
- UUID mineUuid = UUID.randomUUID();
-
- BannerModSettlementSupplySignalState supplySignalState = BannerModSettlementService.summarizeSupplySignals(
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 2),
- new BannerModSettlementDesiredGoodSeed("materials", 1),
- new BannerModSettlementDesiredGoodSeed("construction_materials", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 3),
- new BannerModSettlementDesiredGoodSeed("storage_type:farmers", 1),
- new BannerModSettlementDesiredGoodSeed("trade_stock", 1)
- )),
- new BannerModSettlementStockpileSummary(1, 2, 54, 1, 1, List.of("farmers")),
- new BannerModSettlementMarketState(
- 1,
- 1,
- 27,
- 9,
- 2,
- 1,
- List.of(new BannerModSettlementMarketRecord(marketUuid, "Harbor Square", true, 27, 9)),
- List.of(
- new BannerModSettlementSellerDispatchRecord(UUID.randomUUID(), marketUuid, "Harbor Square", BannerModSettlementSellerDispatchState.READY),
- new BannerModSettlementSellerDispatchRecord(UUID.randomUUID(), marketUuid, "Harbor Square", BannerModSettlementSellerDispatchState.MARKET_CLOSED)
- )
- ),
- List.of(
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, cropAreaUuid, "bannermod:crop_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", cropAreaUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, mineUuid, "bannermod:mining_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", mineUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- new BannerModSettlementResidentRecord(UUID.randomUUID(), BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK, BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY, BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR, BannerModSettlementResidentServiceContract.defaultFor(BannerModSettlementResidentRole.CONTROLLED_WORKER, BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, marketUuid, "bannermod:market_area"), BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", marketUuid, BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING)
- ),
- List.of(
- new BannerModSettlementBuildingRecord(cropAreaUuid, "bannermod:crop_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(mineUuid, "bannermod:mining_area", new BlockPos(10, 64, 10), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(marketUuid, "bannermod:market_area", new BlockPos(20, 64, 20), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of())
- ),
- BannerModSettlementService.ReservationSignalSeed.empty()
- );
-
- assertEquals(6, supplySignalState.signalCount());
- assertEquals(3, supplySignalState.shortageSignalCount());
- assertEquals(3, supplySignalState.shortageUnitCount());
- assertEquals(0, supplySignalState.reservationHintUnitCount());
- assertEquals(List.of(
- new BannerModSettlementSupplySignal("food", 2, 1, 1, 0),
- new BannerModSettlementSupplySignal("materials", 1, 1, 0, 0),
- new BannerModSettlementSupplySignal("construction_materials", 1, 0, 1, 0),
- new BannerModSettlementSupplySignal("market_goods", 3, 2, 1, 0),
- new BannerModSettlementSupplySignal("storage_type:farmers", 1, 1, 0, 0),
- new BannerModSettlementSupplySignal("trade_stock", 1, 2, 0, 0)
- ), supplySignalState.signals());
- }
-
- @Test
- void supplySignalsUseOnlySpecificReservationHints() {
- BannerModSettlementSupplySignalState supplySignalState = BannerModSettlementService.summarizeSupplySignals(
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("market_goods", 3),
- new BannerModSettlementDesiredGoodSeed("food", 2)
- )),
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- List.of(),
- List.of(),
- new BannerModSettlementService.ReservationSignalSeed(1, 12, Map.of("market_goods", 12))
- );
-
- assertEquals(12, supplySignalState.reservationHintUnitCount());
- assertEquals(new BannerModSettlementSupplySignal("market_goods", 3, 0, 3, 12), supplySignalState.signals().get(0));
- assertEquals(new BannerModSettlementSupplySignal("food", 2, 0, 2, 0), supplySignalState.signals().get(1));
- }
-
- @Test
- void summarizesReservationSignalSeedAndFeedsTradeAndMerchantHints() {
- UUID farmerStorageUuid = UUID.randomUUID();
- UUID merchantPortUuid = UUID.randomUUID();
- BannerModSettlementService.ReservationSignalSeed reservationSignalSeed = BannerModSettlementService.summarizeReservationSignalSeed(
- List.of(
- new BannerModSettlementBuildingRecord(farmerStorageUuid, "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 1, 27, true, false, List.of("farmers")),
- new BannerModSettlementBuildingRecord(merchantPortUuid, "bannermod:storage_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 1, 27, true, true, List.of("merchants"))
- ),
- List.of(new com.talhanation.bannermod.shared.logistics.BannerModLogisticsRoute(
- UUID.fromString("00000000-0000-0000-0000-000000000510"),
- new com.talhanation.bannermod.shared.logistics.BannerModLogisticsNodeRef(farmerStorageUuid),
- new com.talhanation.bannermod.shared.logistics.BannerModLogisticsNodeRef(merchantPortUuid),
- com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter.any(),
- 16,
- com.talhanation.bannermod.shared.logistics.BannerModLogisticsPriority.NORMAL
- )),
- List.of(new com.talhanation.bannermod.shared.logistics.BannerModLogisticsReservation(
- UUID.fromString("00000000-0000-0000-0000-000000000511"),
- UUID.fromString("00000000-0000-0000-0000-000000000510"),
- UUID.randomUUID(),
- com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter.any(),
- 12,
- 120L
- ))
- );
-
- assertEquals(1, reservationSignalSeed.activeReservationCount());
- assertEquals(12, reservationSignalSeed.reservedUnitCount());
- assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("storage_type:farmers"));
- assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("storage_type:merchants"));
- assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("market_goods"));
- assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("trade_stock"));
- }
-
- @Test
- void summarizesProjectCandidateFromSettlementSeeds() {
- BannerModSettlementProjectCandidateSeed storageCandidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:crop_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())
- ),
- BannerModSettlementStockpileSummary.empty(),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 2)
- )),
- new BannerModSettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
- ), List.of()),
- true,
- true
- );
-
- assertEquals("storage_foundation", storageCandidate.candidateId());
- assertEquals(BannerModSettlementBuildingProfileSeed.STORAGE, storageCandidate.targetBuildingProfileSeed());
- assertEquals(5, storageCandidate.priority());
- assertEquals(true, storageCandidate.governedSettlement());
- assertEquals(true, storageCandidate.claimedSettlement());
- assertEquals(List.of("storage_missing", "goods_pressure", "market_access_present"), storageCandidate.driverIds());
-
- BannerModSettlementProjectCandidateSeed foodCandidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 2, 54, true, false, List.of("farmers")),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())
- ),
- new BannerModSettlementStockpileSummary(1, 2, 54, 1, 0, List.of("farmers")),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 2),
- new BannerModSettlementDesiredGoodSeed("market_goods", 1)
- )),
- new BannerModSettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
- ), List.of()),
- false,
- true
- );
-
- assertEquals("food_capacity_growth", foodCandidate.candidateId());
- assertEquals(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, foodCandidate.targetBuildingProfileSeed());
- assertEquals(3, foodCandidate.priority());
- assertEquals(List.of("food_demand", "storage_type:farmers"), foodCandidate.driverIds());
- }
-
- @Test
- void logisticsDerivationServiceCombinesStockpileProjectAndSupplySeeds() {
- UUID storageUuid = UUID.randomUUID();
- UUID marketUuid = UUID.randomUUID();
- BannerModSettlementBuildingRecord storage = new BannerModSettlementBuildingRecord(storageUuid, "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 2, 54, true, true, List.of("merchants"));
- BannerModSettlementBuildingRecord market = new BannerModSettlementBuildingRecord(marketUuid, "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of());
- BannerModSettlementResidentRecord seller = new BannerModSettlementResidentRecord(
- UUID.randomUUID(),
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- BannerModSettlementResidentServiceContract.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING,
- marketUuid,
- "bannermod:market_area"
- ),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
- UUID.randomUUID(),
- "blueguild",
- marketUuid,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
- );
- BannerModSettlementMarketState marketState = new BannerModSettlementMarketState(
- 1,
- 1,
- 27,
- 9,
- 1,
- 1,
- List.of(new BannerModSettlementMarketRecord(marketUuid, "Harbor Square", true, 27, 9)),
- List.of(new BannerModSettlementSellerDispatchRecord(seller.residentUuid(), marketUuid, "Harbor Square", BannerModSettlementSellerDispatchState.READY))
- );
-
- BannerModSettlementLogisticsDerivationService.LogisticsResult logistics = BannerModSettlementLogisticsDerivationService.derive(
- List.of(storage, market),
- List.of(seller),
- marketState,
- List.of(),
- List.of(),
- List.of(),
- List.of(),
- true,
- true
- );
-
- BannerModSettlementStockpileSummary expectedStockpile = BannerModSettlementService.summarizeStockpiles(List.of(storage, market), List.of());
- BannerModSettlementDesiredGoodsSeed expectedDesiredGoods = BannerModSettlementService.summarizeDesiredGoods(
- List.of(storage, market),
- expectedStockpile,
- marketState,
- BannerModSeaTradeSummary.summarise(List.of())
- );
- BannerModSettlementProjectCandidateSeed expectedProject = BannerModSettlementService.summarizeProjectCandidate(
- List.of(storage, market),
- expectedStockpile,
- expectedDesiredGoods,
- marketState,
- true,
- true
- );
- BannerModSettlementTradeRouteHandoffSeed expectedTradeRouteHandoff = BannerModSettlementService.summarizeTradeRouteHandoffSeed(
- expectedStockpile,
- marketState,
- expectedDesiredGoods,
- BannerModSettlementService.ReservationSignalSeed.empty(),
- BannerModSeaTradeSummary.summarise(List.of()),
- List.of()
- );
- BannerModSettlementSupplySignalState expectedSupplySignals = BannerModSettlementService.summarizeSupplySignals(
- expectedDesiredGoods,
- expectedStockpile,
- marketState,
- List.of(seller),
- List.of(storage, market),
- BannerModSettlementService.ReservationSignalSeed.empty(),
- BannerModSeaTradeSummary.summarise(List.of())
- );
-
- assertEquals(expectedStockpile, logistics.stockpileSummary());
- assertEquals(expectedDesiredGoods, logistics.desiredGoodsSeed());
- assertEquals(expectedProject, logistics.projectCandidateSeed());
- assertEquals(expectedTradeRouteHandoff, logistics.tradeRouteHandoffSeed());
- assertEquals(expectedSupplySignals, logistics.supplySignalState());
- }
-
- @Test
- void summarizesDesiredGoodsIncludesSeaTradeImportAndExportDrivers() {
- BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
- Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 4),
- Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 2),
- List.of()
- );
-
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed = BannerModSettlementService.summarizeDesiredGoods(
- List.of(),
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- seaTradeSummary
- );
-
- assertEquals(List.of(
- new BannerModSettlementDesiredGoodSeed("sea_import:minecraft:iron_ingot", 2),
- new BannerModSettlementDesiredGoodSeed("sea_export:minecraft:wheat", 4)
- ), desiredGoodsSeed.desiredGoods());
- }
-
- @Test
- void summarizesSupplySignalsCountsSeaTradeMarketAndStorageCoverage() {
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1),
- new BannerModSettlementDesiredGoodSeed("market_goods", 2),
- new BannerModSettlementDesiredGoodSeed("trade_stock", 3),
- new BannerModSettlementDesiredGoodSeed("sea_import:minecraft:iron_ingot", 4),
- new BannerModSettlementDesiredGoodSeed("sea_export:minecraft:wheat", 5)
- ));
- BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
- Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 5),
- Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 4),
- List.of()
- );
-
- BannerModSettlementSupplySignalState signals = BannerModSettlementService.summarizeSupplySignals(
- desiredGoodsSeed,
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 2, List.of("merchants")),
- new BannerModSettlementMarketState(1, 1, 27, 9, 2, 2, List.of(), List.of()),
- List.of(),
- List.of(),
- BannerModSettlementService.ReservationSignalSeed.empty(),
- seaTradeSummary
- );
-
- assertEquals(new BannerModSettlementSupplySignalState(
- 5,
- 0,
- 0,
- 0,
- List.of(
- new BannerModSettlementSupplySignal("storage_type:merchants", 1, 1, 0, 0),
- new BannerModSettlementSupplySignal("market_goods", 2, 2, 0, 0),
- new BannerModSettlementSupplySignal("trade_stock", 3, 3, 0, 0),
- new BannerModSettlementSupplySignal("sea_import:minecraft:iron_ingot", 4, 4, 0, 0),
- new BannerModSettlementSupplySignal("sea_export:minecraft:wheat", 5, 5, 0, 0)
- )
- ), signals);
- }
-
- @Test
- void seaTradeStatusLinesIncludeBenefitsBottlenecksAndFallbackLabels() {
- BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
- Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 5),
- Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 3),
- List.of(BannerModSeaTradeSummary.BOTTLENECK_ONLY_EXPORTS, BannerModSeaTradeSummary.BOTTLENECK_UNFILTERED_ROUTE)
- );
-
- List<String> lines = BannerModSettlementService.seaTradeStatusLines(
- seaTradeSummary,
- List.of(seaTradeRecord(
- "00000000-0000-0000-0000-000000003207",
- UUID.fromString("00000000-0000-0000-0000-000000003101"),
- UUID.fromString("00000000-0000-0000-0000-000000003102"),
- BannerModLogisticsItemFilter.any(),
- 6,
- 1,
- BannerModSeaTradeExecutionState.FAILED,
- "unexpected_failure"
- ))
- );
-
- assertEquals(
- "gui.bannermod.governor.logistics.sea_trade.blocked_cargo 3207 2201 gui.bannermod.governor.logistics.sea_trade.reason.carrier_failed any 1 6",
- lines.get(0)
- );
- assertTrue(lines.contains("Sea import benefit: minecraft:iron_ingot x3"));
- assertTrue(lines.contains("Sea export benefit: minecraft:wheat x5"));
- assertTrue(lines.contains("Sea trade bottleneck: only_exports"));
- assertTrue(lines.contains("Sea trade bottleneck: unfiltered_route"));
- }
-
- @Test
- void summarizesProjectCandidatePrefersMarketFoundationWhenDemandExistsWithoutMarket() {
- BannerModSettlementProjectCandidateSeed candidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(storageBuilding(false, false, List.of("merchants"))),
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 0, List.of("merchants")),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("market_goods", 2)
- )),
- BannerModSettlementMarketState.empty(),
- true,
- false
- );
-
- assertEquals("market_foundation", candidate.candidateId());
- assertEquals(BannerModSettlementBuildingProfileSeed.MARKET, candidate.targetBuildingProfileSeed());
- assertEquals(4, candidate.priority());
- assertEquals(List.of("market_missing", "market_goods_demand", "stockpile_ready"), candidate.driverIds());
- }
-
- @Test
- void summarizesProjectCandidateRecoversClosedMarketsBeforeExpansion() {
- BannerModSettlementProjectCandidateSeed candidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(
- storageBuilding(false, false, List.of()),
- building("bannermod:market_area", BannerModSettlementBuildingProfileSeed.MARKET)
- ),
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
- BannerModSettlementDesiredGoodsSeed.empty(),
- new BannerModSettlementMarketState(2, 1, 27, 9, 1, 1, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
- ), List.of()),
- false,
- false
- );
-
- assertEquals("market_recovery", candidate.candidateId());
- assertEquals(BannerModSettlementBuildingProfileSeed.MARKET, candidate.targetBuildingProfileSeed());
- assertEquals(List.of("closed_market_capacity", "seller_ready"), candidate.driverIds());
- }
-
- @Test
- void summarizesProjectCandidateUsesMaterialPressureWhenStorageAndMarketsExist() {
- BannerModSettlementProjectCandidateSeed candidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(
- storageBuilding(false, false, List.of()),
- building("bannermod:market_area", BannerModSettlementBuildingProfileSeed.MARKET)
- ),
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("materials", 2)
- )),
- new BannerModSettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
- ), List.of()),
- false,
- true
- );
-
- assertEquals("material_capacity_growth", candidate.candidateId());
- assertEquals(BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION, candidate.targetBuildingProfileSeed());
- assertEquals(List.of("materials_demand"), candidate.driverIds());
- }
-
- @Test
- void summarizesProjectCandidateUsesConstructionPressureAndCanSettleOnNone() {
- BannerModSettlementProjectCandidateSeed constructionCandidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(
- storageBuilding(false, false, List.of()),
- building("bannermod:market_area", BannerModSettlementBuildingProfileSeed.MARKET)
- ),
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("construction_materials", 1)
- )),
- new BannerModSettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
- ), List.of()),
- false,
- false
- );
- BannerModSettlementProjectCandidateSeed noneCandidate = BannerModSettlementService.summarizeProjectCandidate(
- List.of(
- storageBuilding(false, false, List.of()),
- building("bannermod:market_area", BannerModSettlementBuildingProfileSeed.MARKET),
- building("bannermod:crop_area", BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION)
- ),
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
- new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 1)
- )),
- new BannerModSettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
- new BannerModSettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
- ), List.of()),
- false,
- false
- );
-
- assertEquals("construction_capacity_growth", constructionCandidate.candidateId());
- assertEquals(BannerModSettlementBuildingProfileSeed.CONSTRUCTION, constructionCandidate.targetBuildingProfileSeed());
- assertEquals("none", noneCandidate.candidateId());
- assertEquals(0, noneCandidate.priority());
- }
-
- private static BannerModSeaTradeExecutionRecord seaTradeRecord(String routeId,
- UUID sourceId,
- UUID destinationId,
- BannerModLogisticsItemFilter filter,
- int requestedCount,
- int cargoCount,
- BannerModSeaTradeExecutionState state,
- String failureReason) {
- return new BannerModSeaTradeExecutionRecord(
- UUID.fromString(routeId),
- BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER.equals(failureReason)
- ? null
- : UUID.fromString("00000000-0000-0000-0000-000000002201"),
- sourceId,
- destinationId,
- filter,
- requestedCount,
- cargoCount,
- state,
- failureReason
- );
- }
-
- private static BannerModSettlementBuildingRecord building(String typeId,
- BannerModSettlementBuildingProfileSeed profileSeed) {
- return new BannerModSettlementBuildingRecord(
- UUID.randomUUID(),
- typeId,
- BlockPos.ZERO,
- UUID.randomUUID(),
- "blueguild",
- 0,
- 1,
- 0,
- List.of(),
- false,
- 0,
- 0,
- false,
- false,
- List.of(),
- profileSeed.category(),
- profileSeed
- );
- }
-
- private static BannerModSettlementBuildingRecord storageBuilding(boolean routed,
- boolean portEntrypoint,
- List<String> typeIds) {
- return new BannerModSettlementBuildingRecord(
- UUID.randomUUID(),
- "bannermod:storage_area",
- BlockPos.ZERO,
- UUID.randomUUID(),
- "blueguild",
- 0,
- 1,
- 0,
- List.of(),
- true,
- 1,
- 27,
- routed,
- portEntrypoint,
- typeIds,
- BannerModSettlementBuildingProfileSeed.STORAGE.category(),
- BannerModSettlementBuildingProfileSeed.STORAGE
- );
- }
-}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilderTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilderTest.java
index be9f06f2..3beff6c1 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilderTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotBuilderTest.java
@@ -9,20 +9,20 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
-class BannerModSettlementSnapshotBuilderTest {
+class SettlementSnapshotBuilderTest {
@Test
void summarizeCountsAggregatesCapacitiesAndWorkerAssignmentBuckets() {
Object counts = summarizeCounts(
List.of(
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:house", BlockPos.ZERO, null, null, 3, 2, 1, List.of()),
- new BannerModSettlementBuildingRecord(UUID.randomUUID(), "bannermod:mine", BlockPos.ZERO, null, null, -4, -2, -1, List.of())
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:house", BlockPos.ZERO, null, null, 3, 2, 1, List.of()),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:mine", BlockPos.ZERO, null, null, -4, -2, -1, List.of())
),
List.of(
- worker(BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
- worker(BannerModSettlementResidentAssignmentState.UNASSIGNED),
- worker(BannerModSettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING),
- worker(BannerModSettlementResidentAssignmentState.NOT_APPLICABLE),
+ worker(SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ worker(SettlementResidentAssignmentState.UNASSIGNED),
+ worker(SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING),
+ worker(SettlementResidentAssignmentState.NOT_APPLICABLE),
villager()
)
);
@@ -47,14 +47,14 @@ void summarizeCountsReturnsZerosForEmptyInputs() {
assertEquals(0, accessor(counts, "missingWorkAreaAssignmentCount"));
}
- private static BannerModSettlementResidentRecord worker(BannerModSettlementResidentAssignmentState assignmentState) {
- return new BannerModSettlementResidentRecord(
+ private static SettlementResidentRecord worker(SettlementResidentAssignmentState assignmentState) {
+ return new SettlementResidentRecord(
UUID.randomUUID(),
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.FLOATING_LABOR,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.FLOATING_LABOR,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.randomUUID(),
"blueguild",
null,
@@ -62,25 +62,25 @@ private static BannerModSettlementResidentRecord worker(BannerModSettlementResid
);
}
- private static BannerModSettlementResidentRecord villager() {
- return new BannerModSettlementResidentRecord(
+ private static SettlementResidentRecord villager() {
+ return new SettlementResidentRecord(
UUID.randomUUID(),
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
null,
"blueguild",
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE
);
}
- private static Object summarizeCounts(List<BannerModSettlementBuildingRecord> buildings,
- List<BannerModSettlementResidentRecord> residents) {
+ private static Object summarizeCounts(List<SettlementBuildingRecord> buildings,
+ List<SettlementResidentRecord> residents) {
try {
- Method method = BannerModSettlementSnapshotBuilder.class.getDeclaredMethod("summarizeCounts", List.class, List.class);
+ Method method = SettlementSnapshotBuilder.class.getDeclaredMethod("summarizeCounts", List.class, List.class);
method.setAccessible(true);
return method.invoke(null, buildings, residents);
} catch (ReflectiveOperationException e) {
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRoundtripTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRoundtripTest.java
index 890adc5e..82d7c7c7 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRoundtripTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRoundtripTest.java
@@ -14,14 +14,14 @@
/**
* TESTSAVELOAD-001: settlement snapshot save/load roundtrip coverage.
*
- * <p>Each test builds a {@link BannerModSettlementSnapshot}, runs it through
+ * <p>Each test builds a {@link SettlementSnapshot}, runs it through
* {@code toTag} -> {@code fromTag}, and asserts that the deserialized snapshot equals the
* original. Records auto-generate {@code equals} from the full component list, so
* {@code assertEquals(original, restored)} fails the moment a field is added/removed without
* the codec being updated. Each test additionally asserts every top-level snapshot field
* individually so a regression points at the offending column rather than just "not equal".
*
- * <p>Snapshot fields (must stay in sync with {@link BannerModSettlementSnapshot}):
+ * <p>Snapshot fields (must stay in sync with {@link SettlementSnapshot}):
* <ul>
* <li>claimUuid</li>
* <li>anchorChunkX</li>
@@ -36,20 +36,20 @@
* <li>missingWorkAreaAssignmentCount</li>
* <li>stockpileSummary</li>
* <li>marketState</li>
- * <li>desiredGoodsSeed</li>
- * <li>projectCandidateSeed</li>
- * <li>tradeRouteHandoffSeed</li>
+ * <li>desiredGoodsSnapshot</li>
+ * <li>projectCandidateSnapshot</li>
+ * <li>tradeRouteHandoffSnapshot</li>
* <li>supplySignalState</li>
* <li>residents</li>
* <li>buildings</li>
* </ul>
*/
-class BannerModSettlementSnapshotRoundtripTest {
+class SettlementSnapshotRoundtripTest {
@Test
void emptySnapshotRoundTripsThroughTagCodec() {
UUID claimUuid = UUID.randomUUID();
- BannerModSettlementSnapshot original = new BannerModSettlementSnapshot(
+ SettlementSnapshot original = new SettlementSnapshot(
claimUuid,
0,
0,
@@ -61,17 +61,17 @@ void emptySnapshotRoundTripsThroughTagCodec() {
0,
0,
0,
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(),
List.of()
);
- BannerModSettlementSnapshot restored = BannerModSettlementSnapshot.fromTag(original.toTag());
+ SettlementSnapshot restored = SettlementSnapshot.fromTag(original.toTag());
assertEqualsFieldByField(original, restored);
assertEquals(original, restored);
@@ -81,7 +81,7 @@ void emptySnapshotRoundTripsThroughTagCodec() {
void singleBuildingSnapshotRoundTripsThroughTagCodec() {
UUID claimUuid = UUID.randomUUID();
UUID buildingUuid = UUID.randomUUID();
- BannerModSettlementBuildingRecord building = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord building = new SettlementBuildingRecord(
buildingUuid,
"bannermod:storage_area",
new BlockPos(8, 64, -16),
@@ -97,11 +97,11 @@ void singleBuildingSnapshotRoundTripsThroughTagCodec() {
true,
false,
List.of("food", "materials"),
- BannerModSettlementBuildingCategory.STORAGE,
- BannerModSettlementBuildingProfileSeed.STORAGE
+ SettlementBuildingCategory.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE
);
- BannerModSettlementSnapshot original = new BannerModSettlementSnapshot(
+ SettlementSnapshot original = new SettlementSnapshot(
claimUuid,
3,
-2,
@@ -113,17 +113,17 @@ void singleBuildingSnapshotRoundTripsThroughTagCodec() {
0,
1,
0,
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(),
List.of(building)
);
- BannerModSettlementSnapshot restored = BannerModSettlementSnapshot.fromTag(original.toTag());
+ SettlementSnapshot restored = SettlementSnapshot.fromTag(original.toTag());
assertEqualsFieldByField(original, restored);
assertEquals(original, restored);
@@ -139,70 +139,70 @@ void fullSnapshotRoundTripsAllNestedRecordsAndLists() {
UUID storageBuildingUuid = UUID.randomUUID();
UUID marketBuildingUuid = UUID.randomUUID();
- BannerModSettlementResidentRecord governor = new BannerModSettlementResidentRecord(
+ SettlementResidentRecord governor = new SettlementResidentRecord(
UUID.randomUUID(),
- BannerModSettlementResidentRole.GOVERNOR_RECRUIT,
- BannerModSettlementResidentScheduleSeed.GOVERNING,
- BannerModSettlementResidentScheduleWindowSeed.CIVIC_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentJobDefinition.defaultFor(
- BannerModSettlementResidentRole.GOVERNOR_RECRUIT,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentRole.GOVERNOR_RECRUIT,
+ SettlementResidentScheduleSeed.GOVERNING,
+ SettlementResidentScheduleWindowSeed.CIVIC_DAY,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentJobDefinition.defaultFor(
+ SettlementResidentRole.GOVERNOR_RECRUIT,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentServiceContract.notServiceActor(),
null
),
- new BannerModSettlementResidentJobTargetSelectionSeed(
- BannerModSettlementJobTargetSelectionMode.NONE, null, null
+ new SettlementResidentJobTargetSelectionState(
+ SettlementJobTargetSelectionMode.NONE, null, null
),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
UUID.randomUUID(),
"blueguild",
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE,
- BannerModSettlementResidentRoleProfile.defaultFor(
- BannerModSettlementResidentRole.GOVERNOR_RECRUIT,
- BannerModSettlementResidentRuntimeRoleSeed.GOVERNANCE,
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE,
+ SettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRole.GOVERNOR_RECRUIT,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentAssignmentState.NOT_APPLICABLE
)
);
- BannerModSettlementResidentRecord worker = new BannerModSettlementResidentRecord(
+ SettlementResidentRecord worker = new SettlementResidentRecord(
workerUuid,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentScheduleWindowSeed.LABOR_DAY,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ new SettlementResidentServiceContract(
+ SettlementServiceActorState.LOCAL_BUILDING_SERVICE,
workAreaUuid,
"bannermod:crop_area"
),
- new BannerModSettlementResidentJobDefinition(
- BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR,
+ new SettlementResidentJobDefinition(
+ SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR,
workAreaUuid,
"bannermod:crop_area",
- BannerModSettlementBuildingCategory.FOOD,
- BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION
+ SettlementBuildingCategory.FOOD,
+ SettlementBuildingProfileSeed.FOOD_PRODUCTION
),
- new BannerModSettlementResidentJobTargetSelectionSeed(
- BannerModSettlementJobTargetSelectionMode.SERVICE_BUILDING, null, null
+ new SettlementResidentJobTargetSelectionState(
+ SettlementJobTargetSelectionMode.SERVICE_BUILDING, null, null
),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.randomUUID(),
"blueguild",
workAreaUuid,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING,
- BannerModSettlementResidentRoleProfile.defaultFor(
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING,
+ SettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
)
);
- BannerModSettlementBuildingRecord storage = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord storage = new SettlementBuildingRecord(
storageBuildingUuid,
"bannermod:storage_area",
new BlockPos(2, 64, 4),
@@ -218,11 +218,11 @@ void fullSnapshotRoundTripsAllNestedRecordsAndLists() {
true,
true,
List.of("food", "wood"),
- BannerModSettlementBuildingCategory.STORAGE,
- BannerModSettlementBuildingProfileSeed.STORAGE
+ SettlementBuildingCategory.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE
);
- BannerModSettlementBuildingRecord market = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord market = new SettlementBuildingRecord(
marketBuildingUuid,
"bannermod:market_area",
new BlockPos(20, 64, 8),
@@ -238,11 +238,11 @@ void fullSnapshotRoundTripsAllNestedRecordsAndLists() {
false,
false,
List.of(),
- BannerModSettlementBuildingCategory.MARKET,
- BannerModSettlementBuildingProfileSeed.MARKET
+ SettlementBuildingCategory.MARKET,
+ SettlementBuildingProfileSeed.MARKET
);
- BannerModSettlementBuildingRecord crop = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord crop = new SettlementBuildingRecord(
workAreaUuid,
"bannermod:crop_area",
new BlockPos(-12, 64, 6),
@@ -258,64 +258,64 @@ void fullSnapshotRoundTripsAllNestedRecordsAndLists() {
false,
false,
List.of(),
- BannerModSettlementBuildingCategory.FOOD,
- BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION
+ SettlementBuildingCategory.FOOD,
+ SettlementBuildingProfileSeed.FOOD_PRODUCTION
);
- BannerModSettlementStockpileSummary stockpile = new BannerModSettlementStockpileSummary(
+ SettlementStockpileSummary stockpile = new SettlementStockpileSummary(
1, 4, 144, 1, 1, List.of("food", "wood")
);
- BannerModSettlementMarketState marketState = new BannerModSettlementMarketState(
+ SettlementMarketState marketState = new SettlementMarketState(
1,
1,
64,
32,
1,
1,
- List.of(new BannerModSettlementMarketRecord(marketBuildingUuid, "Central Market", true, 64, 32)),
- List.of(new BannerModSettlementSellerDispatchRecord(
- workerUuid, marketBuildingUuid, "Central Market", BannerModSettlementSellerDispatchState.READY
+ List.of(new SettlementMarketRecord(marketBuildingUuid, "Central Market", true, 64, 32)),
+ List.of(new SettlementSellerDispatchRecord(
+ workerUuid, marketBuildingUuid, "Central Market", SettlementSellerDispatchState.READY
))
);
- BannerModSettlementDesiredGoodsSeed desiredGoodsSeed = new BannerModSettlementDesiredGoodsSeed(
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot = new SettlementDesiredGoodsSnapshot(
List.of(
- new BannerModSettlementDesiredGoodSeed("food", 3),
- new BannerModSettlementDesiredGoodSeed("wood", 1)
+ new SettlementDesiredGoodSnapshot("food", 3),
+ new SettlementDesiredGoodSnapshot("wood", 1)
)
);
- BannerModSettlementProjectCandidateSeed projectCandidateSeed = new BannerModSettlementProjectCandidateSeed(
+ SettlementProjectCandidateSnapshot projectCandidateSnapshot = new SettlementProjectCandidateSnapshot(
"expand_storage",
- BannerModSettlementBuildingProfileSeed.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE,
5,
true,
true,
List.of("supply_pressure", "governor_priority")
);
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed = new BannerModSettlementTradeRouteHandoffSeed(
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot = new SettlementTradeRouteHandoffSnapshot(
1,
1,
1,
1,
2,
7,
- List.of(new BannerModSettlementDesiredGoodSeed("food", 3)),
- List.of(new BannerModSettlementSellerDispatchRecord(
- workerUuid, marketBuildingUuid, "Central Market", BannerModSettlementSellerDispatchState.READY
+ List.of(new SettlementDesiredGoodSnapshot("food", 3)),
+ List.of(new SettlementSellerDispatchRecord(
+ workerUuid, marketBuildingUuid, "Central Market", SettlementSellerDispatchState.READY
)),
List.of("port_open", "route_authored")
);
- BannerModSettlementSupplySignalState supplySignalState = new BannerModSettlementSupplySignalState(
+ SettlementSupplySignalState supplySignalState = new SettlementSupplySignalState(
2,
1,
4,
3,
List.of(
- new BannerModSettlementSupplySignal("food", 10, 6, 4, 3),
- new BannerModSettlementSupplySignal("wood", 5, 5, 0, 0)
+ new SettlementSupplySignal("food", 10, 6, 4, 3),
+ new SettlementSupplySignal("wood", 5, 5, 0, 0)
)
);
- BannerModSettlementSnapshot original = new BannerModSettlementSnapshot(
+ SettlementSnapshot original = new SettlementSnapshot(
claimUuid,
7,
-3,
@@ -329,15 +329,15 @@ void fullSnapshotRoundTripsAllNestedRecordsAndLists() {
1,
stockpile,
marketState,
- desiredGoodsSeed,
- projectCandidateSeed,
- tradeRouteHandoffSeed,
+ desiredGoodsSnapshot,
+ projectCandidateSnapshot,
+ tradeRouteHandoffSnapshot,
supplySignalState,
List.of(governor, worker),
List.of(storage, market, crop)
);
- BannerModSettlementSnapshot restored = BannerModSettlementSnapshot.fromTag(original.toTag());
+ SettlementSnapshot restored = SettlementSnapshot.fromTag(original.toTag());
assertEqualsFieldByField(original, restored);
assertEquals(original, restored);
@@ -365,14 +365,14 @@ void corruptedButValidEdgeCaseRoundTripsWithDefaults() {
tag.putInt("AssignedResidentCount", 2);
tag.putInt("UnassignedWorkerCount", 1);
tag.putInt("MissingWorkAreaAssignmentCount", 0);
- // Optional sub-tags (StockpileSummary, MarketState, DesiredGoodsSeed,
- // ProjectCandidateSeed, TradeRouteHandoffSeed, SupplySignalState, SettlementFactionId)
+ // Optional sub-tags (StockpileSummary, MarketState, DesiredGoodsSnapshot,
+ // ProjectCandidateSnapshot, TradeRouteHandoffSnapshot, SupplySignalState, SettlementFactionId)
// intentionally omitted.
// Residents: present but empty.
tag.put("Residents", new ListTag());
// One realistic building so the buildings list is not also empty.
ListTag buildings = new ListTag();
- BannerModSettlementBuildingRecord onlyBuilding = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord onlyBuilding = new SettlementBuildingRecord(
UUID.randomUUID(),
"bannermod:storage_area",
new BlockPos(0, 64, 0),
@@ -388,13 +388,13 @@ void corruptedButValidEdgeCaseRoundTripsWithDefaults() {
false,
false,
List.of("food"),
- BannerModSettlementBuildingCategory.STORAGE,
- BannerModSettlementBuildingProfileSeed.STORAGE
+ SettlementBuildingCategory.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE
);
buildings.add(onlyBuilding.toTag());
tag.put("Buildings", buildings);
- BannerModSettlementSnapshot fromMissing = BannerModSettlementSnapshot.fromTag(tag);
+ SettlementSnapshot fromMissing = SettlementSnapshot.fromTag(tag);
assertEquals(claimUuid, fromMissing.claimUuid());
assertEquals(1, fromMissing.anchorChunkX());
@@ -407,19 +407,19 @@ void corruptedButValidEdgeCaseRoundTripsWithDefaults() {
assertEquals(2, fromMissing.assignedResidentCount());
assertEquals(1, fromMissing.unassignedWorkerCount());
assertEquals(0, fromMissing.missingWorkAreaAssignmentCount());
- assertEquals(BannerModSettlementStockpileSummary.empty(), fromMissing.stockpileSummary());
- assertEquals(BannerModSettlementMarketState.empty(), fromMissing.marketState());
- assertEquals(BannerModSettlementDesiredGoodsSeed.empty(), fromMissing.desiredGoodsSeed());
- assertEquals(BannerModSettlementProjectCandidateSeed.empty(), fromMissing.projectCandidateSeed());
- assertEquals(BannerModSettlementTradeRouteHandoffSeed.empty(), fromMissing.tradeRouteHandoffSeed());
- assertEquals(BannerModSettlementSupplySignalState.empty(), fromMissing.supplySignalState());
+ assertEquals(SettlementStockpileSummary.empty(), fromMissing.stockpileSummary());
+ assertEquals(SettlementMarketState.empty(), fromMissing.marketState());
+ assertEquals(SettlementDesiredGoodsSnapshot.empty(), fromMissing.desiredGoodsSnapshot());
+ assertEquals(SettlementProjectCandidateSnapshot.empty(), fromMissing.projectCandidateSnapshot());
+ assertEquals(SettlementTradeRouteHandoffSnapshot.empty(), fromMissing.tradeRouteHandoffSnapshot());
+ assertEquals(SettlementSupplySignalState.empty(), fromMissing.supplySignalState());
assertTrue(fromMissing.residents().isEmpty());
assertEquals(1, fromMissing.buildings().size());
assertEquals(onlyBuilding, fromMissing.buildings().get(0));
// Second pass: roundtrip the snapshot we just hydrated to confirm the codec stays
// stable across writes once the defaults have materialized.
- BannerModSettlementSnapshot rehydrated = BannerModSettlementSnapshot.fromTag(fromMissing.toTag());
+ SettlementSnapshot rehydrated = SettlementSnapshot.fromTag(fromMissing.toTag());
assertEqualsFieldByField(fromMissing, rehydrated);
assertEquals(fromMissing, rehydrated);
}
@@ -428,11 +428,11 @@ void corruptedButValidEdgeCaseRoundTripsWithDefaults() {
/**
* Asserts every snapshot record component matches between {@code expected} and
- * {@code actual}. Mirrors the field list in {@link BannerModSettlementSnapshot}; if a
+ * {@code actual}. Mirrors the field list in {@link SettlementSnapshot}; if a
* field is added there, this helper must be updated and the test will fail until it is.
*/
- private static void assertEqualsFieldByField(BannerModSettlementSnapshot expected,
- BannerModSettlementSnapshot actual) {
+ private static void assertEqualsFieldByField(SettlementSnapshot expected,
+ SettlementSnapshot actual) {
assertEquals(expected.claimUuid(), actual.claimUuid(), "claimUuid");
assertEquals(expected.anchorChunkX(), actual.anchorChunkX(), "anchorChunkX");
assertEquals(expected.anchorChunkZ(), actual.anchorChunkZ(), "anchorChunkZ");
@@ -446,9 +446,9 @@ private static void assertEqualsFieldByField(BannerModSettlementSnapshot expecte
assertEquals(expected.missingWorkAreaAssignmentCount(), actual.missingWorkAreaAssignmentCount(), "missingWorkAreaAssignmentCount");
assertEquals(expected.stockpileSummary(), actual.stockpileSummary(), "stockpileSummary");
assertEquals(expected.marketState(), actual.marketState(), "marketState");
- assertEquals(expected.desiredGoodsSeed(), actual.desiredGoodsSeed(), "desiredGoodsSeed");
- assertEquals(expected.projectCandidateSeed(), actual.projectCandidateSeed(), "projectCandidateSeed");
- assertEquals(expected.tradeRouteHandoffSeed(), actual.tradeRouteHandoffSeed(), "tradeRouteHandoffSeed");
+ assertEquals(expected.desiredGoodsSnapshot(), actual.desiredGoodsSnapshot(), "desiredGoodsSnapshot");
+ assertEquals(expected.projectCandidateSnapshot(), actual.projectCandidateSnapshot(), "projectCandidateSnapshot");
+ assertEquals(expected.tradeRouteHandoffSnapshot(), actual.tradeRouteHandoffSnapshot(), "tradeRouteHandoffSnapshot");
assertEquals(expected.supplySignalState(), actual.supplySignalState(), "supplySignalState");
assertEquals(expected.residents(), actual.residents(), "residents");
assertEquals(expected.buildings(), actual.buildings(), "buildings");
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRuntimeTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRuntimeTest.java
new file mode 100644
index 00000000..2ad91699
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotRuntimeTest.java
@@ -0,0 +1,808 @@
+package com.talhanation.bannermod.settlement;
+
+import com.talhanation.bannermod.settlement.bootstrap.SettlementRecord;
+import com.talhanation.bannermod.settlement.bootstrap.SettlementStatus;
+import com.talhanation.bannermod.settlement.building.BuildingType;
+import com.talhanation.bannermod.settlement.building.ValidatedBuildingRecord;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeSummary;
+import net.minecraft.core.BlockPos;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.phys.AABB;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class SettlementSnapshotRuntimeTest {
+
+ @Test
+ void fixedScenarioSnapshotNbtMatchesBaselineByteForByte() {
+ UUID claimUuid = UUID.fromString("00000000-0000-0000-0000-000000000501");
+ SettlementSnapshot snapshot = SettlementSnapshot.create(
+ claimUuid,
+ new ChunkPos(3, -2),
+ "blueguild"
+ );
+
+ CompoundTag expected = new CompoundTag();
+ expected.putUUID("ClaimUuid", claimUuid);
+ expected.putInt("AnchorChunkX", 3);
+ expected.putInt("AnchorChunkZ", -2);
+ expected.putString("SettlementFactionId", "blueguild");
+ expected.putLong("LastRefreshedTick", 0L);
+ expected.putInt("ResidentCapacity", 0);
+ expected.putInt("WorkplaceCapacity", 0);
+ expected.putInt("AssignedWorkerCount", 0);
+ expected.putInt("AssignedResidentCount", 0);
+ expected.putInt("UnassignedWorkerCount", 0);
+ expected.putInt("MissingWorkAreaAssignmentCount", 0);
+ expected.put("StockpileSummary", SettlementStockpileSummary.empty().toTag());
+ expected.put("MarketState", SettlementMarketState.empty().toTag());
+ expected.put("DesiredGoodsSeed", SettlementDesiredGoodsSnapshot.empty().toTag());
+ expected.put("ProjectCandidateSeed", SettlementProjectCandidateSnapshot.empty().toTag());
+ expected.put("TradeRouteHandoffSeed", SettlementTradeRouteHandoffSnapshot.empty().toTag());
+ expected.put("SupplySignalState", SettlementSupplySignalState.empty().toTag());
+ expected.put("Residents", new ListTag());
+ expected.put("Buildings", new ListTag());
+
+ assertEquals(expected, snapshot.toTag());
+ }
+
+ @Test
+ void summarizesAuthoredStockpileSeedsFromBuildingRecords() {
+ SettlementStockpileSummary summary = SettlementSnapshotRuntime.summarizeStockpiles(List.of(
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 2, 54, true, false, List.of("farmers", "merchants")),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:storage_area", new BlockPos(10, 64, 10), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 1, 27, false, true, List.of("farmers")),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:crop_area", new BlockPos(20, 64, 20), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 99, 99, true, true, List.of("ignored"))
+ ));
+
+ assertEquals(2, summary.storageBuildingCount());
+ assertEquals(3, summary.containerCount());
+ assertEquals(81, summary.slotCapacity());
+ assertEquals(1, summary.routedStorageCount());
+ assertEquals(1, summary.portEntrypointCount());
+ assertEquals(List.of("farmers", "merchants"), summary.authoredStorageTypeIds());
+ }
+
+ @Test
+ void mapsValidatedHouseStorageAndWorkplaceBuildingsIntoSnapshotRecords() {
+ UUID ownerUuid = UUID.randomUUID();
+ SettlementBuildingRecord houseRecord = SettlementSnapshotRuntime.fromValidatedBuildingFields(UUID.randomUUID(), BuildingType.HOUSE, new BlockPos(0, 64, 0), 3, ownerUuid);
+ SettlementBuildingRecord storageRecord = SettlementSnapshotRuntime.fromValidatedBuildingFields(UUID.randomUUID(), BuildingType.STORAGE, new BlockPos(8, 64, 0), 2, ownerUuid);
+ SettlementBuildingRecord farmRecord = SettlementSnapshotRuntime.fromValidatedBuildingFields(UUID.randomUUID(), BuildingType.FARM, new BlockPos(16, 64, 0), 1, ownerUuid);
+ SettlementStockpileSummary summary = SettlementSnapshotRuntime.summarizeStockpiles(List.of(storageRecord));
+
+ assertEquals("bannermod:validated_house", houseRecord.buildingTypeId());
+ assertEquals(3, houseRecord.residentCapacity());
+ assertEquals(ownerUuid, houseRecord.ownerUuid());
+ assertEquals("bannermod:validated_storage", storageRecord.buildingTypeId());
+ assertEquals(2, summary.containerCount());
+ assertEquals(54, summary.slotCapacity());
+ assertEquals(SettlementBuildingProfileSeed.STORAGE, storageRecord.buildingProfileSeed());
+ assertEquals("bannermod:validated_farm", farmRecord.buildingTypeId());
+ assertEquals(1, farmRecord.workplaceSlots());
+ assertEquals(SettlementBuildingProfileSeed.FOOD_PRODUCTION, farmRecord.buildingProfileSeed());
+ }
+
+ @Test
+ void validatedBuildingLookupUsesSettlementIdInsteadOfClaimId() {
+ UUID settlementId = UUID.randomUUID();
+ UUID claimId = UUID.randomUUID();
+ SettlementRecord settlement = new SettlementRecord(
+ settlementId,
+ UUID.randomUUID(),
+ "faction",
+ claimId,
+ Level.OVERWORLD,
+ BlockPos.ZERO,
+ BlockPos.ZERO,
+ UUID.randomUUID(),
+ SettlementStatus.ACTIVE,
+ 10L
+ );
+ ValidatedBuildingRecord matchingRecord = new ValidatedBuildingRecord(
+ UUID.randomUUID(),
+ settlementId,
+ BuildingType.FARM,
+ Level.OVERWORLD,
+ new BlockPos(4, 64, 4),
+ List.of(),
+ new AABB(4, 64, 4, 8, 65, 8),
+ null,
+ 4,
+ 80,
+ 1L,
+ 1L,
+ 0L
+ );
+ ValidatedBuildingRecord wrongRecord = new ValidatedBuildingRecord(
+ UUID.randomUUID(),
+ claimId,
+ BuildingType.FARM,
+ Level.OVERWORLD,
+ new BlockPos(4, 64, 4),
+ List.of(),
+ new AABB(4, 64, 4, 8, 65, 8),
+ null,
+ 4,
+ 80,
+ 1L,
+ 1L,
+ 0L
+ );
+
+ assertTrue(SettlementSnapshotRuntime.validatedBuildingBelongsToSettlement(settlement, matchingRecord));
+ assertEquals(false, SettlementSnapshotRuntime.validatedBuildingBelongsToSettlement(settlement, wrongRecord));
+ }
+
+ @Test
+ void mergesValidatedCapacityIntoLiveWorkAreaRecordWithoutBreakingBindingUuid() {
+ UUID liveWorkAreaUuid = UUID.randomUUID();
+ UUID settlementId = UUID.randomUUID();
+ UUID ownerUuid = UUID.randomUUID();
+ BlockPos origin = new BlockPos(12, 64, 12);
+ ValidatedBuildingRecord record = new ValidatedBuildingRecord(
+ UUID.randomUUID(),
+ settlementId,
+ BuildingType.FARM,
+ Level.OVERWORLD,
+ origin,
+ List.of(),
+ new AABB(12, 64, 12, 20, 65, 20),
+ null,
+ 4,
+ 100,
+ 1L,
+ 1L,
+ 0L
+ );
+ SettlementBuildingRecord liveRecord = new SettlementBuildingRecord(
+ liveWorkAreaUuid,
+ "bannermod:crop_area",
+ origin,
+ ownerUuid,
+ "54ac1b4f-006f-4fcb-a48d-47f93a9f575a",
+ 0,
+ 1,
+ 0,
+ List.of()
+ );
+ SettlementBuildingRecord expectedValidated = SettlementSnapshotRuntime.fromValidatedBuildingFields(
+ liveWorkAreaUuid,
+ BuildingType.FARM,
+ origin,
+ 4,
+ ownerUuid
+ );
+
+ SettlementBuildingRecord merged = SettlementSnapshotRuntime.mergeValidatedBuildingIntoLiveRecord(record, liveRecord);
+
+ assertEquals(liveWorkAreaUuid, merged.buildingUuid());
+ assertEquals("bannermod:crop_area", merged.buildingTypeId());
+ assertEquals(expectedValidated.workplaceSlots(), merged.workplaceSlots());
+ assertEquals(expectedValidated.buildingCategory(), merged.buildingCategory());
+ assertEquals(expectedValidated.buildingProfileSeed(), merged.buildingProfileSeed());
+ assertEquals(ownerUuid, merged.ownerUuid());
+ assertEquals(liveRecord.teamId(), merged.teamId());
+ }
+
+ @Test
+ void ignoresLegacyValidatedBuildingAssignedCitizensOnReload() {
+ UUID staleWorkerUuid = UUID.randomUUID();
+ CompoundTag tag = new CompoundTag();
+ tag.putUUID("BuildingId", UUID.randomUUID());
+ tag.putUUID("SettlementId", UUID.randomUUID());
+ tag.putString("Type", BuildingType.FARM.name());
+ tag.putString("Dimension", "minecraft:overworld");
+ tag.putLong("AnchorPos", new BlockPos(16, 64, 0).asLong());
+ tag.putString("State", "VALID");
+ tag.putInt("Capacity", 1);
+ tag.putInt("QualityScore", 1);
+ ListTag legacyAssigned = new ListTag();
+ CompoundTag legacyAssignedEntry = new CompoundTag();
+ legacyAssignedEntry.putUUID("CitizenId", staleWorkerUuid);
+ legacyAssigned.add(legacyAssignedEntry);
+ tag.put("AssignedCitizenIds", legacyAssigned);
+
+ ValidatedBuildingRecord reloaded = ValidatedBuildingRecord.fromTag(tag);
+ SettlementBuildingRecord building = SettlementSnapshotRuntime.fromValidatedBuilding(reloaded, null);
+
+ assertEquals(0, building.assignedWorkerCount());
+ assertEquals(List.of(), building.assignedResidentUuids());
+ }
+
+ @Test
+ void summarizesMarketStateIntoAggregateSeed() {
+ List<SettlementMarketRecord> markets = List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
+ new SettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
+ );
+
+ SettlementMarketState marketState = SettlementSnapshotRuntime.summarizeMarketState(markets);
+
+ assertEquals(2, marketState.marketCount());
+ assertEquals(1, marketState.openMarketCount());
+ assertEquals(45, marketState.totalStorageSlots());
+ assertEquals(13, marketState.freeStorageSlots());
+ assertEquals(0, marketState.sellerDispatchCount());
+ assertEquals(0, marketState.readySellerDispatchCount());
+ assertEquals(markets, marketState.markets());
+ assertEquals(List.of(), marketState.sellerDispatches());
+ }
+
+
+ @Test
+ void scheduleWindowSeedDefaultsFromScheduleAndRuntimeRole() {
+ assertEquals(
+ SettlementResidentScheduleWindowSeed.CIVIC_DAY,
+ SettlementResidentScheduleWindowSeed.defaultFor(
+ SettlementResidentScheduleSeed.GOVERNING,
+ SettlementResidentRuntimeRoleState.GOVERNANCE
+ )
+ );
+ assertEquals(
+ SettlementResidentScheduleWindowSeed.LABOR_DAY,
+ SettlementResidentScheduleWindowSeed.defaultFor(
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.ORPHANED_LABOR_ASSIGNMENT
+ )
+ );
+ assertEquals(
+ SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
+ SettlementResidentScheduleWindowSeed.defaultFor(
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE
+ )
+ );
+ }
+
+ @Test
+ void schedulePolicyDefaultsFromResidentSeeds() {
+ SettlementResidentRoleProfile floatingProfile = SettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentRuntimeRoleState.FLOATING_LABOR,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentAssignmentState.UNASSIGNED
+ );
+
+ assertEquals(
+ SettlementResidentSchedulePolicySeed.GOVERNANCE_CIVIC,
+ SettlementResidentSchedulePolicy.defaultFor(
+ SettlementResidentScheduleSeed.GOVERNING,
+ SettlementResidentScheduleWindowSeed.CIVIC_DAY,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRole.GOVERNOR_RECRUIT,
+ SettlementResidentRuntimeRoleState.GOVERNANCE,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentAssignmentState.NOT_APPLICABLE
+ )
+ ).policySeed()
+ );
+ assertEquals(
+ SettlementResidentSchedulePolicySeed.FLOATING_LABOR_FLEX,
+ SettlementResidentSchedulePolicy.defaultFor(
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
+ SettlementResidentRuntimeRoleState.FLOATING_LABOR,
+ floatingProfile
+ ).policySeed()
+ );
+ assertEquals(
+ SettlementResidentSchedulePolicySeed.ORPHANED_LABOR_DAY,
+ SettlementResidentSchedulePolicy.defaultFor(
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentScheduleWindowSeed.LABOR_DAY,
+ SettlementResidentRuntimeRoleState.ORPHANED_LABOR_ASSIGNMENT,
+ SettlementResidentRoleProfile.defaultFor(
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentRuntimeRoleState.ORPHANED_LABOR_ASSIGNMENT,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentAssignmentState.ASSIGNED_MISSING_BUILDING
+ )
+ ).policySeed()
+ );
+ }
+
+ @Test
+ void projectsSellerDispatchSeedFromMarketServiceContracts() {
+ UUID openMarketUuid = UUID.randomUUID();
+ UUID closedMarketUuid = UUID.randomUUID();
+ UUID cropAreaUuid = UUID.randomUUID();
+ UUID readySellerUuid = UUID.randomUUID();
+ UUID blockedSellerUuid = UUID.randomUUID();
+
+ SettlementMarketState marketState = SettlementSnapshotRuntime.applySellerDispatchSeed(
+ SettlementSnapshotRuntime.summarizeMarketState(List.of(
+ new SettlementMarketRecord(openMarketUuid, "Harbor Square", true, 27, 9),
+ new SettlementMarketRecord(closedMarketUuid, "East Gate", false, 18, 4)
+ )),
+ List.of(
+ new SettlementResidentRecord(readySellerUuid, SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, openMarketUuid, "bannermod:market_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", openMarketUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ new SettlementResidentRecord(blockedSellerUuid, SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, closedMarketUuid, "bannermod:market_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", closedMarketUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, cropAreaUuid, "bannermod:crop_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", cropAreaUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.SETTLEMENT_IDLE, SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX, SettlementResidentRuntimeRoleState.FLOATING_LABOR, SettlementResidentServiceContract.notServiceActor(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", null, SettlementResidentAssignmentState.UNASSIGNED)
+ ),
+ List.of(
+ new SettlementBuildingRecord(openMarketUuid, "bannermod:market_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(readySellerUuid), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(closedMarketUuid, "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(blockedSellerUuid), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(cropAreaUuid, "bannermod:crop_area", new BlockPos(16, 64, 16), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of())
+ )
+ );
+
+ assertEquals(2, marketState.sellerDispatchCount());
+ assertEquals(1, marketState.readySellerDispatchCount());
+ assertEquals(List.of(
+ new SettlementSellerDispatchRecord(readySellerUuid, openMarketUuid, "Harbor Square", SettlementSellerDispatchState.READY),
+ new SettlementSellerDispatchRecord(blockedSellerUuid, closedMarketUuid, "East Gate", SettlementSellerDispatchState.MARKET_CLOSED)
+ ), marketState.sellerDispatches());
+
+ List<SettlementResidentRecord> residents = SettlementSnapshotRuntime.applyResidentJobTargetSelectionStates(
+ List.of(
+ new SettlementResidentRecord(readySellerUuid, SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, openMarketUuid, "bannermod:market_area"), new SettlementResidentJobDefinition(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, openMarketUuid, "bannermod:market_area", SettlementBuildingCategory.MARKET, SettlementBuildingProfileSeed.MARKET), SettlementResidentJobTargetSelectionState.none(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", openMarketUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, SettlementResidentRoleProfile.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING)),
+ new SettlementResidentRecord(blockedSellerUuid, SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, closedMarketUuid, "bannermod:market_area"), new SettlementResidentJobDefinition(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, closedMarketUuid, "bannermod:market_area", SettlementBuildingCategory.MARKET, SettlementBuildingProfileSeed.MARKET), SettlementResidentJobTargetSelectionState.none(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", closedMarketUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, SettlementResidentRoleProfile.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING)),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, cropAreaUuid, "bannermod:crop_area"), new SettlementResidentJobDefinition(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, cropAreaUuid, "bannermod:crop_area", SettlementBuildingCategory.FOOD, SettlementBuildingProfileSeed.FOOD_PRODUCTION), SettlementResidentJobTargetSelectionState.none(), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", cropAreaUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, SettlementResidentRoleProfile.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING))
+ ),
+ marketState
+ );
+
+ assertEquals(SettlementJobTargetSelectionMode.SELLER_MARKET_DISPATCH, residents.get(0).jobTargetSelectionState().selectionMode());
+ assertEquals(openMarketUuid, residents.get(0).jobTargetSelectionState().targetMarketUuid());
+ assertEquals("Harbor Square", residents.get(0).jobTargetSelectionState().targetMarketName());
+ assertEquals(SettlementJobTargetSelectionMode.SELLER_MARKET_CLOSED, residents.get(1).jobTargetSelectionState().selectionMode());
+ assertEquals(closedMarketUuid, residents.get(1).jobTargetSelectionState().targetMarketUuid());
+ assertEquals("East Gate", residents.get(1).jobTargetSelectionState().targetMarketName());
+ assertEquals(SettlementJobTargetSelectionMode.SERVICE_BUILDING, residents.get(2).jobTargetSelectionState().selectionMode());
+ }
+
+ @Test
+ void summarizesDesiredGoodsFromBuildingProfilesStockpileTypesAndMarkets() {
+ List<SettlementBuildingRecord> buildings = List.of(
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:crop_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:mining_area", new BlockPos(10, 64, 10), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:build_area", new BlockPos(20, 64, 20), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:market_area", new BlockPos(30, 64, 30), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())
+ );
+
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot = SettlementSnapshotRuntime.summarizeDesiredGoods(
+ buildings,
+ new SettlementStockpileSummary(1, 2, 54, 1, 0, List.of("farmers", "merchants")),
+ new SettlementMarketState(2, 1, 45, 13, 0, 0, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
+ new SettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
+ ), List.of())
+ );
+
+ assertEquals(List.of(
+ new SettlementDesiredGoodSnapshot("food", 1),
+ new SettlementDesiredGoodSnapshot("materials", 1),
+ new SettlementDesiredGoodSnapshot("construction_materials", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 3),
+ new SettlementDesiredGoodSnapshot("storage_type:farmers", 1),
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1),
+ new SettlementDesiredGoodSnapshot("trade_stock", 1)
+ ), desiredGoodsSnapshot.desiredGoods());
+ }
+
+ @Test
+ void summarizesTradeRouteHandoffSnapshotFromDispatchDemandAndRouteHints() {
+ SettlementMarketState marketState = new SettlementMarketState(
+ 2,
+ 1,
+ 45,
+ 13,
+ 2,
+ 1,
+ List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
+ new SettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
+ ),
+ List.of(
+ new SettlementSellerDispatchRecord(UUID.randomUUID(), UUID.randomUUID(), "Harbor Square", SettlementSellerDispatchState.READY),
+ new SettlementSellerDispatchRecord(UUID.randomUUID(), UUID.randomUUID(), "East Gate", SettlementSellerDispatchState.MARKET_CLOSED)
+ )
+ );
+
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("market_goods", 3),
+ new SettlementDesiredGoodSnapshot("trade_stock", 1),
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1)
+ ));
+
+ SettlementTradeRouteHandoffSnapshot handoffSnapshot = SettlementSnapshotRuntime.summarizeTradeRouteHandoffSnapshot(
+ new SettlementStockpileSummary(2, 3, 81, 1, 1, List.of("farmers", "merchants")),
+ marketState,
+ desiredGoodsSnapshot,
+ new SettlementSnapshotRuntime.ReservationSignalSeed(2, 24, Map.of("trade_stock", 24))
+ );
+
+ assertEquals(2, handoffSnapshot.sellerDispatchCount());
+ assertEquals(1, handoffSnapshot.readySellerDispatchCount());
+ assertEquals(1, handoffSnapshot.routedStorageCount());
+ assertEquals(1, handoffSnapshot.portEntrypointCount());
+ assertEquals(2, handoffSnapshot.activeReservationCount());
+ assertEquals(24, handoffSnapshot.reservedUnitCount());
+ assertEquals(desiredGoodsSnapshot.desiredGoods(), handoffSnapshot.desiredGoods());
+ assertEquals(marketState.sellerDispatches(), handoffSnapshot.sellerDispatches());
+ }
+
+ @Test
+ void summarizesSupplySignalsFromDesiredGoodsCoverageAndReservationHints() {
+ UUID marketUuid = UUID.randomUUID();
+ UUID cropAreaUuid = UUID.randomUUID();
+ UUID mineUuid = UUID.randomUUID();
+
+ SettlementSupplySignalState supplySignalState = SettlementSnapshotRuntime.summarizeSupplySignals(
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 2),
+ new SettlementDesiredGoodSnapshot("materials", 1),
+ new SettlementDesiredGoodSnapshot("construction_materials", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 3),
+ new SettlementDesiredGoodSnapshot("storage_type:farmers", 1),
+ new SettlementDesiredGoodSnapshot("trade_stock", 1)
+ )),
+ new SettlementStockpileSummary(1, 2, 54, 1, 1, List.of("farmers")),
+ new SettlementMarketState(
+ 1,
+ 1,
+ 27,
+ 9,
+ 2,
+ 1,
+ List.of(new SettlementMarketRecord(marketUuid, "Harbor Square", true, 27, 9)),
+ List.of(
+ new SettlementSellerDispatchRecord(UUID.randomUUID(), marketUuid, "Harbor Square", SettlementSellerDispatchState.READY),
+ new SettlementSellerDispatchRecord(UUID.randomUUID(), marketUuid, "Harbor Square", SettlementSellerDispatchState.MARKET_CLOSED)
+ )
+ ),
+ List.of(
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, cropAreaUuid, "bannermod:crop_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", cropAreaUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, mineUuid, "bannermod:mining_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", mineUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING),
+ new SettlementResidentRecord(UUID.randomUUID(), SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentScheduleSeed.ASSIGNED_WORK, SettlementResidentScheduleWindowSeed.LABOR_DAY, SettlementResidentRuntimeRoleState.LOCAL_LABOR, SettlementResidentServiceContract.defaultFor(SettlementResidentRole.CONTROLLED_WORKER, SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING, marketUuid, "bannermod:market_area"), SettlementResidentMode.PROJECTED_CONTROLLED_WORKER, UUID.randomUUID(), "blueguild", marketUuid, SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING)
+ ),
+ List.of(
+ new SettlementBuildingRecord(cropAreaUuid, "bannermod:crop_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(mineUuid, "bannermod:mining_area", new BlockPos(10, 64, 10), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(marketUuid, "bannermod:market_area", new BlockPos(20, 64, 20), UUID.randomUUID(), "blueguild", 0, 1, 1, List.of(UUID.randomUUID()), false, 0, 0, false, false, List.of())
+ ),
+ SettlementSnapshotRuntime.ReservationSignalSeed.empty()
+ );
+
+ assertEquals(6, supplySignalState.signalCount());
+ assertEquals(3, supplySignalState.shortageSignalCount());
+ assertEquals(3, supplySignalState.shortageUnitCount());
+ assertEquals(0, supplySignalState.reservationHintUnitCount());
+ assertEquals(List.of(
+ new SettlementSupplySignal("food", 2, 1, 1, 0),
+ new SettlementSupplySignal("materials", 1, 1, 0, 0),
+ new SettlementSupplySignal("construction_materials", 1, 0, 1, 0),
+ new SettlementSupplySignal("market_goods", 3, 2, 1, 0),
+ new SettlementSupplySignal("storage_type:farmers", 1, 1, 0, 0),
+ new SettlementSupplySignal("trade_stock", 1, 2, 0, 0)
+ ), supplySignalState.signals());
+ }
+
+ @Test
+ void supplySignalsUseOnlySpecificReservationHints() {
+ SettlementSupplySignalState supplySignalState = SettlementSnapshotRuntime.summarizeSupplySignals(
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("market_goods", 3),
+ new SettlementDesiredGoodSnapshot("food", 2)
+ )),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ List.of(),
+ List.of(),
+ new SettlementSnapshotRuntime.ReservationSignalSeed(1, 12, Map.of("market_goods", 12))
+ );
+
+ assertEquals(12, supplySignalState.reservationHintUnitCount());
+ assertEquals(new SettlementSupplySignal("market_goods", 3, 0, 3, 12), supplySignalState.signals().get(0));
+ assertEquals(new SettlementSupplySignal("food", 2, 0, 2, 0), supplySignalState.signals().get(1));
+ }
+
+ @Test
+ void summarizesReservationSignalSeedAndFeedsTradeAndMerchantHints() {
+ UUID farmerStorageUuid = UUID.randomUUID();
+ UUID merchantPortUuid = UUID.randomUUID();
+ SettlementSnapshotRuntime.ReservationSignalSeed reservationSignalSeed = SettlementSnapshotRuntime.summarizeReservationSignalSeed(
+ List.of(
+ new SettlementBuildingRecord(farmerStorageUuid, "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 1, 27, true, false, List.of("farmers")),
+ new SettlementBuildingRecord(merchantPortUuid, "bannermod:storage_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 1, 27, true, true, List.of("merchants"))
+ ),
+ List.of(new com.talhanation.bannermod.shared.logistics.BannerModLogisticsRoute(
+ UUID.fromString("00000000-0000-0000-0000-000000000510"),
+ new com.talhanation.bannermod.shared.logistics.BannerModLogisticsNodeRef(farmerStorageUuid),
+ new com.talhanation.bannermod.shared.logistics.BannerModLogisticsNodeRef(merchantPortUuid),
+ com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter.any(),
+ 16,
+ com.talhanation.bannermod.shared.logistics.BannerModLogisticsPriority.NORMAL
+ )),
+ List.of(new com.talhanation.bannermod.shared.logistics.BannerModLogisticsReservation(
+ UUID.fromString("00000000-0000-0000-0000-000000000511"),
+ UUID.fromString("00000000-0000-0000-0000-000000000510"),
+ UUID.randomUUID(),
+ com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter.any(),
+ 12,
+ 120L
+ ))
+ );
+
+ assertEquals(1, reservationSignalSeed.activeReservationCount());
+ assertEquals(12, reservationSignalSeed.reservedUnitCount());
+ assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("storage_type:farmers"));
+ assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("storage_type:merchants"));
+ assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("market_goods"));
+ assertEquals(12, reservationSignalSeed.reservationHintUnitsByGood().get("trade_stock"));
+ }
+
+ @Test
+ void summarizesProjectCandidateFromSettlementSeeds() {
+ SettlementProjectCandidateSnapshot storageCandidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:crop_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of()),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())
+ ),
+ SettlementStockpileSummary.empty(),
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 2)
+ )),
+ new SettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
+ ), List.of()),
+ true,
+ true
+ );
+
+ assertEquals("storage_foundation", storageCandidate.candidateId());
+ assertEquals(SettlementBuildingProfileSeed.STORAGE, storageCandidate.targetBuildingProfileSeed());
+ assertEquals(5, storageCandidate.priority());
+ assertEquals(true, storageCandidate.governedSettlement());
+ assertEquals(true, storageCandidate.claimedSettlement());
+ assertEquals(List.of("storage_missing", "goods_pressure", "market_access_present"), storageCandidate.driverIds());
+
+ SettlementProjectCandidateSnapshot foodCandidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:storage_area", new BlockPos(0, 64, 0), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), true, 2, 54, true, false, List.of("farmers")),
+ new SettlementBuildingRecord(UUID.randomUUID(), "bannermod:market_area", new BlockPos(8, 64, 8), UUID.randomUUID(), "blueguild", 0, 1, 0, List.of(), false, 0, 0, false, false, List.of())
+ ),
+ new SettlementStockpileSummary(1, 2, 54, 1, 0, List.of("farmers")),
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 2),
+ new SettlementDesiredGoodSnapshot("market_goods", 1)
+ )),
+ new SettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
+ ), List.of()),
+ false,
+ true
+ );
+
+ assertEquals("food_capacity_growth", foodCandidate.candidateId());
+ assertEquals(SettlementBuildingProfileSeed.FOOD_PRODUCTION, foodCandidate.targetBuildingProfileSeed());
+ assertEquals(3, foodCandidate.priority());
+ assertEquals(List.of("food_demand", "storage_type:farmers"), foodCandidate.driverIds());
+ }
+
+ @Test
+ void summarizesDesiredGoodsIncludesSeaTradeImportAndExportDrivers() {
+ BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 4),
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 2),
+ List.of()
+ );
+
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot = SettlementSnapshotRuntime.summarizeDesiredGoods(
+ List.of(),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ seaTradeSummary
+ );
+
+ assertEquals(List.of(
+ new SettlementDesiredGoodSnapshot("sea_import:minecraft:iron_ingot", 2),
+ new SettlementDesiredGoodSnapshot("sea_export:minecraft:wheat", 4)
+ ), desiredGoodsSnapshot.desiredGoods());
+ }
+
+ @Test
+ void summarizesSupplySignalsCountsSeaTradeMarketAndStorageCoverage() {
+ SettlementDesiredGoodsSnapshot desiredGoodsSnapshot = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1),
+ new SettlementDesiredGoodSnapshot("market_goods", 2),
+ new SettlementDesiredGoodSnapshot("trade_stock", 3),
+ new SettlementDesiredGoodSnapshot("sea_import:minecraft:iron_ingot", 4),
+ new SettlementDesiredGoodSnapshot("sea_export:minecraft:wheat", 5)
+ ));
+ BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 5),
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 4),
+ List.of()
+ );
+
+ SettlementSupplySignalState signals = SettlementSnapshotRuntime.summarizeSupplySignals(
+ desiredGoodsSnapshot,
+ new SettlementStockpileSummary(1, 1, 27, 0, 2, List.of("merchants")),
+ new SettlementMarketState(1, 1, 27, 9, 2, 2, List.of(), List.of()),
+ List.of(),
+ List.of(),
+ SettlementSnapshotRuntime.ReservationSignalSeed.empty(),
+ seaTradeSummary
+ );
+
+ assertEquals(new SettlementSupplySignalState(
+ 5,
+ 0,
+ 0,
+ 0,
+ List.of(
+ new SettlementSupplySignal("storage_type:merchants", 1, 1, 0, 0),
+ new SettlementSupplySignal("market_goods", 2, 2, 0, 0),
+ new SettlementSupplySignal("trade_stock", 3, 3, 0, 0),
+ new SettlementSupplySignal("sea_import:minecraft:iron_ingot", 4, 4, 0, 0),
+ new SettlementSupplySignal("sea_export:minecraft:wheat", 5, 5, 0, 0)
+ )
+ ), signals);
+ }
+
+ @Test
+ void summarizesProjectCandidatePrefersMarketFoundationWhenDemandExistsWithoutMarket() {
+ SettlementProjectCandidateSnapshot candidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(storageBuilding(false, false, List.of("merchants"))),
+ new SettlementStockpileSummary(1, 1, 27, 0, 0, List.of("merchants")),
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("market_goods", 2)
+ )),
+ SettlementMarketState.empty(),
+ true,
+ false
+ );
+
+ assertEquals("market_foundation", candidate.candidateId());
+ assertEquals(SettlementBuildingProfileSeed.MARKET, candidate.targetBuildingProfileSeed());
+ assertEquals(4, candidate.priority());
+ assertEquals(List.of("market_missing", "market_goods_demand", "stockpile_ready"), candidate.driverIds());
+ }
+
+ @Test
+ void summarizesProjectCandidateRecoversClosedMarketsBeforeExpansion() {
+ SettlementProjectCandidateSnapshot candidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(
+ storageBuilding(false, false, List.of()),
+ building("bannermod:market_area", SettlementBuildingProfileSeed.MARKET)
+ ),
+ new SettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
+ SettlementDesiredGoodsSnapshot.empty(),
+ new SettlementMarketState(2, 1, 27, 9, 1, 1, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9),
+ new SettlementMarketRecord(UUID.randomUUID(), "East Gate", false, 18, 4)
+ ), List.of()),
+ false,
+ false
+ );
+
+ assertEquals("market_recovery", candidate.candidateId());
+ assertEquals(SettlementBuildingProfileSeed.MARKET, candidate.targetBuildingProfileSeed());
+ assertEquals(List.of("closed_market_capacity", "seller_ready"), candidate.driverIds());
+ }
+
+ @Test
+ void summarizesProjectCandidateUsesMaterialPressureWhenStorageAndMarketsExist() {
+ SettlementProjectCandidateSnapshot candidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(
+ storageBuilding(false, false, List.of()),
+ building("bannermod:market_area", SettlementBuildingProfileSeed.MARKET)
+ ),
+ new SettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("materials", 2)
+ )),
+ new SettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
+ ), List.of()),
+ false,
+ true
+ );
+
+ assertEquals("material_capacity_growth", candidate.candidateId());
+ assertEquals(SettlementBuildingProfileSeed.MATERIAL_PRODUCTION, candidate.targetBuildingProfileSeed());
+ assertEquals(List.of("materials_demand"), candidate.driverIds());
+ }
+
+ @Test
+ void summarizesProjectCandidateUsesConstructionPressureAndCanSettleOnNone() {
+ SettlementProjectCandidateSnapshot constructionCandidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(
+ storageBuilding(false, false, List.of()),
+ building("bannermod:market_area", SettlementBuildingProfileSeed.MARKET)
+ ),
+ new SettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("construction_materials", 1)
+ )),
+ new SettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
+ ), List.of()),
+ false,
+ false
+ );
+ SettlementProjectCandidateSnapshot noneCandidate = SettlementSnapshotRuntime.summarizeProjectCandidate(
+ List.of(
+ storageBuilding(false, false, List.of()),
+ building("bannermod:market_area", SettlementBuildingProfileSeed.MARKET),
+ building("bannermod:crop_area", SettlementBuildingProfileSeed.FOOD_PRODUCTION)
+ ),
+ new SettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
+ new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 1)
+ )),
+ new SettlementMarketState(1, 1, 27, 9, 0, 0, List.of(
+ new SettlementMarketRecord(UUID.randomUUID(), "Harbor Square", true, 27, 9)
+ ), List.of()),
+ false,
+ false
+ );
+
+ assertEquals("construction_capacity_growth", constructionCandidate.candidateId());
+ assertEquals(SettlementBuildingProfileSeed.CONSTRUCTION, constructionCandidate.targetBuildingProfileSeed());
+ assertEquals("none", noneCandidate.candidateId());
+ assertEquals(0, noneCandidate.priority());
+ }
+
+ private static SettlementBuildingRecord building(String typeId,
+ SettlementBuildingProfileSeed profileSeed) {
+ return new SettlementBuildingRecord(
+ UUID.randomUUID(),
+ typeId,
+ BlockPos.ZERO,
+ UUID.randomUUID(),
+ "blueguild",
+ 0,
+ 1,
+ 0,
+ List.of(),
+ false,
+ 0,
+ 0,
+ false,
+ false,
+ List.of(),
+ profileSeed.category(),
+ profileSeed
+ );
+ }
+
+ private static SettlementBuildingRecord storageBuilding(boolean routed,
+ boolean portEntrypoint,
+ List<String> typeIds) {
+ return new SettlementBuildingRecord(
+ UUID.randomUUID(),
+ "bannermod:storage_area",
+ BlockPos.ZERO,
+ UUID.randomUUID(),
+ "blueguild",
+ 0,
+ 1,
+ 0,
+ List.of(),
+ true,
+ 1,
+ 27,
+ routed,
+ portEntrypoint,
+ typeIds,
+ SettlementBuildingProfileSeed.STORAGE.category(),
+ SettlementBuildingProfileSeed.STORAGE
+ );
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotTest.java
index 1aa3c724..2b262e06 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementSnapshotTest.java
@@ -10,11 +10,11 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class BannerModSettlementSnapshotTest {
+class SettlementSnapshotTest {
@Test
void constructorNormalizesNegativeCountsAndNullSeeds() {
- BannerModSettlementSnapshot snapshot = new BannerModSettlementSnapshot(
+ SettlementSnapshot snapshot = new SettlementSnapshot(
UUID.randomUUID(),
4,
-2,
@@ -42,19 +42,19 @@ void constructorNormalizesNegativeCountsAndNullSeeds() {
assertEquals(0, snapshot.assignedResidentCount());
assertEquals(0, snapshot.unassignedWorkerCount());
assertEquals(0, snapshot.missingWorkAreaAssignmentCount());
- assertEquals(BannerModSettlementStockpileSummary.empty(), snapshot.stockpileSummary());
- assertEquals(BannerModSettlementMarketState.empty(), snapshot.marketState());
- assertEquals(BannerModSettlementDesiredGoodsSeed.empty(), snapshot.desiredGoodsSeed());
- assertEquals(BannerModSettlementProjectCandidateSeed.empty(), snapshot.projectCandidateSeed());
- assertEquals(BannerModSettlementTradeRouteHandoffSeed.empty(), snapshot.tradeRouteHandoffSeed());
- assertEquals(BannerModSettlementSupplySignalState.empty(), snapshot.supplySignalState());
+ assertEquals(SettlementStockpileSummary.empty(), snapshot.stockpileSummary());
+ assertEquals(SettlementMarketState.empty(), snapshot.marketState());
+ assertEquals(SettlementDesiredGoodsSnapshot.empty(), snapshot.desiredGoodsSnapshot());
+ assertEquals(SettlementProjectCandidateSnapshot.empty(), snapshot.projectCandidateSnapshot());
+ assertEquals(SettlementTradeRouteHandoffSnapshot.empty(), snapshot.tradeRouteHandoffSnapshot());
+ assertEquals(SettlementSupplySignalState.empty(), snapshot.supplySignalState());
assertTrue(snapshot.residents().isEmpty());
assertTrue(snapshot.buildings().isEmpty());
}
@Test
void anchorChunkReturnsExpectedChunkPosition() {
- BannerModSettlementSnapshot snapshot = BannerModSettlementSnapshot.create(UUID.randomUUID(), new ChunkPos(9, -3), "blueguild");
+ SettlementSnapshot snapshot = SettlementSnapshot.create(UUID.randomUUID(), new ChunkPos(9, -3), "blueguild");
assertEquals(new ChunkPos(9, -3), snapshot.anchorChunk());
}
@@ -74,37 +74,37 @@ void fromTagFallsBackWhenOptionalFieldsAreMissing() {
tag.putInt("UnassignedWorkerCount", 0);
tag.putInt("MissingWorkAreaAssignmentCount", 0);
- BannerModSettlementSnapshot snapshot = BannerModSettlementSnapshot.fromTag(tag);
+ SettlementSnapshot snapshot = SettlementSnapshot.fromTag(tag);
assertEquals(claimUuid, snapshot.claimUuid());
assertEquals(new ChunkPos(7, -4), snapshot.anchorChunk());
assertEquals(null, snapshot.settlementFactionId());
- assertEquals(BannerModSettlementStockpileSummary.empty(), snapshot.stockpileSummary());
- assertEquals(BannerModSettlementMarketState.empty(), snapshot.marketState());
- assertEquals(BannerModSettlementDesiredGoodsSeed.empty(), snapshot.desiredGoodsSeed());
- assertEquals(BannerModSettlementProjectCandidateSeed.empty(), snapshot.projectCandidateSeed());
- assertEquals(BannerModSettlementTradeRouteHandoffSeed.empty(), snapshot.tradeRouteHandoffSeed());
- assertEquals(BannerModSettlementSupplySignalState.empty(), snapshot.supplySignalState());
+ assertEquals(SettlementStockpileSummary.empty(), snapshot.stockpileSummary());
+ assertEquals(SettlementMarketState.empty(), snapshot.marketState());
+ assertEquals(SettlementDesiredGoodsSnapshot.empty(), snapshot.desiredGoodsSnapshot());
+ assertEquals(SettlementProjectCandidateSnapshot.empty(), snapshot.projectCandidateSnapshot());
+ assertEquals(SettlementTradeRouteHandoffSnapshot.empty(), snapshot.tradeRouteHandoffSnapshot());
+ assertEquals(SettlementSupplySignalState.empty(), snapshot.supplySignalState());
assertTrue(snapshot.residents().isEmpty());
assertTrue(snapshot.buildings().isEmpty());
}
@Test
void constructorCopiesResidentAndBuildingListsImmutably() {
- BannerModSettlementResidentRecord resident = new BannerModSettlementResidentRecord(
+ SettlementResidentRecord resident = new SettlementResidentRecord(
UUID.randomUUID(),
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentScheduleWindowSeed.DAYLIGHT_FLEX,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
null,
"blueguild",
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE
);
- BannerModSettlementBuildingRecord building = new BannerModSettlementBuildingRecord(
+ SettlementBuildingRecord building = new SettlementBuildingRecord(
UUID.randomUUID(),
"bannermod:storage_area",
net.minecraft.core.BlockPos.ZERO,
@@ -122,7 +122,7 @@ void constructorCopiesResidentAndBuildingListsImmutably() {
List.of()
);
- BannerModSettlementSnapshot snapshot = new BannerModSettlementSnapshot(
+ SettlementSnapshot snapshot = new SettlementSnapshot(
UUID.randomUUID(),
0,
0,
@@ -134,12 +134,12 @@ void constructorCopiesResidentAndBuildingListsImmutably() {
0,
0,
0,
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(resident),
List.of(building)
);
diff --git a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignalsTest.java b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignalsTest.java
index b608bb3e..57add3bb 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignalsTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/BannerModSettlementStrategicSignalsTest.java
@@ -10,15 +10,15 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class BannerModSettlementStrategicSignalsTest {
+class SettlementStrategicSignalsTest {
@Test
void classifiesFoodAndStorageAsSurplusHubWithWarObjective() {
- BannerModSettlementStrategicSignals signals = BannerModSettlementStrategicSignals.fromSnapshot(snapshot(
- new BannerModSettlementStockpileSummary(1, 2, 54, 0, 0, List.of()),
- BannerModSettlementMarketState.empty(),
+ SettlementStrategicSignals signals = SettlementStrategicSignals.fromSnapshot(snapshot(
+ new SettlementStockpileSummary(1, 2, 54, 0, 0, List.of()),
+ SettlementMarketState.empty(),
List.of(
- building("bannermod:crop_area", BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION),
- building("bannermod:storage_area", BannerModSettlementBuildingProfileSeed.STORAGE)
+ building("bannermod:crop_area", SettlementBuildingProfileSeed.FOOD_PRODUCTION),
+ building("bannermod:storage_area", SettlementBuildingProfileSeed.STORAGE)
)
));
@@ -31,10 +31,10 @@ void classifiesFoodAndStorageAsSurplusHubWithWarObjective() {
@Test
void waterAccessBecomesWaterGateAndCheapRoute() {
- BannerModSettlementStrategicSignals signals = BannerModSettlementStrategicSignals.fromSnapshot(snapshot(
- new BannerModSettlementStockpileSummary(1, 2, 54, 1, 1, List.of()),
- new BannerModSettlementMarketState(1, 1, 27, 20, 0, 0, List.of(), List.of()),
- List.of(building("bannermod:storage_area", BannerModSettlementBuildingProfileSeed.STORAGE))
+ SettlementStrategicSignals signals = SettlementStrategicSignals.fromSnapshot(snapshot(
+ new SettlementStockpileSummary(1, 2, 54, 1, 1, List.of()),
+ new SettlementMarketState(1, 1, 27, 20, 0, 0, List.of(), List.of()),
+ List.of(building("bannermod:storage_area", SettlementBuildingProfileSeed.STORAGE))
));
assertEquals("water_gate", signals.roleId());
@@ -45,10 +45,10 @@ void waterAccessBecomesWaterGateAndCheapRoute() {
@Test
void marketAndRouteStorageBecomeJunctionMarketWithSingleRoutePressure() {
- BannerModSettlementStrategicSignals signals = BannerModSettlementStrategicSignals.fromSnapshot(snapshot(
- new BannerModSettlementStockpileSummary(1, 1, 27, 1, 0, List.of()),
- new BannerModSettlementMarketState(1, 1, 9, 4, 0, 0, List.of(), List.of()),
- List.of(building("bannermod:storage_area", BannerModSettlementBuildingProfileSeed.STORAGE))
+ SettlementStrategicSignals signals = SettlementStrategicSignals.fromSnapshot(snapshot(
+ new SettlementStockpileSummary(1, 1, 27, 1, 0, List.of()),
+ new SettlementMarketState(1, 1, 9, 4, 0, 0, List.of(), List.of()),
+ List.of(building("bannermod:storage_area", SettlementBuildingProfileSeed.STORAGE))
));
assertEquals("junction_market", signals.roleId());
@@ -59,12 +59,12 @@ void marketAndRouteStorageBecomeJunctionMarketWithSingleRoutePressure() {
@Test
void fortifiedRouteStorageBecomesChokepointFort() {
- BannerModSettlementStrategicSignals signals = BannerModSettlementStrategicSignals.fromSnapshot(snapshot(
- new BannerModSettlementStockpileSummary(1, 1, 27, 1, 0, List.of()),
- BannerModSettlementMarketState.empty(),
+ SettlementStrategicSignals signals = SettlementStrategicSignals.fromSnapshot(snapshot(
+ new SettlementStockpileSummary(1, 1, 27, 1, 0, List.of()),
+ SettlementMarketState.empty(),
List.of(
- building("bannermod:starter_fort", BannerModSettlementBuildingProfileSeed.GENERAL),
- building("bannermod:storage_area", BannerModSettlementBuildingProfileSeed.STORAGE)
+ building("bannermod:starter_fort", SettlementBuildingProfileSeed.GENERAL),
+ building("bannermod:storage_area", SettlementBuildingProfileSeed.STORAGE)
)
));
@@ -74,12 +74,12 @@ void fortifiedRouteStorageBecomesChokepointFort() {
@Test
void landlockedMaterialsBecomeWorkedGoodsSpecialization() {
- BannerModSettlementStrategicSignals signals = BannerModSettlementStrategicSignals.fromSnapshot(snapshot(
- new BannerModSettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
- BannerModSettlementMarketState.empty(),
+ SettlementStrategicSignals signals = SettlementStrategicSignals.fromSnapshot(snapshot(
+ new SettlementStockpileSummary(1, 1, 27, 0, 0, List.of()),
+ SettlementMarketState.empty(),
List.of(
- building("bannermod:mining_area", BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION),
- building("bannermod:storage_area", BannerModSettlementBuildingProfileSeed.STORAGE)
+ building("bannermod:mining_area", SettlementBuildingProfileSeed.MATERIAL_PRODUCTION),
+ building("bannermod:storage_area", SettlementBuildingProfileSeed.STORAGE)
)
));
@@ -90,11 +90,11 @@ void landlockedMaterialsBecomeWorkedGoodsSpecialization() {
@Test
void nullSnapshotAndSparseOutpostUseFallbackSignals() {
- BannerModSettlementStrategicSignals emptySignals = BannerModSettlementStrategicSignals.fromSnapshot(null);
- BannerModSettlementStrategicSignals outpostSignals = BannerModSettlementStrategicSignals.fromSnapshot(snapshot(
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- List.of(building("bannermod:watchtower", BannerModSettlementBuildingProfileSeed.GENERAL))
+ SettlementStrategicSignals emptySignals = SettlementStrategicSignals.fromSnapshot(null);
+ SettlementStrategicSignals outpostSignals = SettlementStrategicSignals.fromSnapshot(snapshot(
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ List.of(building("bannermod:watchtower", SettlementBuildingProfileSeed.GENERAL))
));
assertEquals("outpost", emptySignals.roleId());
@@ -105,7 +105,7 @@ void nullSnapshotAndSparseOutpostUseFallbackSignals() {
@Test
void constructorNormalizesBlankSignalMetadataToStableFallbacks() {
- BannerModSettlementStrategicSignals signals = new BannerModSettlementStrategicSignals(
+ SettlementStrategicSignals signals = new SettlementStrategicSignals(
" ",
"",
null,
@@ -126,11 +126,11 @@ void constructorNormalizesBlankSignalMetadataToStableFallbacks() {
assertTrue(signals.loyaltyPressureIds().isEmpty());
}
- private static BannerModSettlementSnapshot snapshot(BannerModSettlementStockpileSummary stockpileSummary,
- BannerModSettlementMarketState marketState,
- List<BannerModSettlementBuildingRecord> buildings) {
+ private static SettlementSnapshot snapshot(SettlementStockpileSummary stockpileSummary,
+ SettlementMarketState marketState,
+ List<SettlementBuildingRecord> buildings) {
ChunkPos anchor = new ChunkPos(0, 0);
- return new BannerModSettlementSnapshot(
+ return new SettlementSnapshot(
UUID.randomUUID(),
anchor.x,
anchor.z,
@@ -144,17 +144,17 @@ private static BannerModSettlementSnapshot snapshot(BannerModSettlementStockpile
0,
stockpileSummary,
marketState,
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(),
buildings
);
}
- private static BannerModSettlementBuildingRecord building(String typeId, BannerModSettlementBuildingProfileSeed profileSeed) {
- return new BannerModSettlementBuildingRecord(
+ private static SettlementBuildingRecord building(String typeId, SettlementBuildingProfileSeed profileSeed) {
+ return new SettlementBuildingRecord(
UUID.randomUUID(),
typeId,
BlockPos.ZERO,
diff --git a/src/test/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisorTest.java b/src/test/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisorTest.java
index f0b30b44..4bdde615 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisorTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/dispatch/BannerModSellerDispatchAdvisorTest.java
@@ -1,8 +1,8 @@
package com.talhanation.bannermod.settlement.dispatch;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchState;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchRecord;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchState;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -23,14 +23,14 @@ class BannerModSellerDispatchAdvisorTest {
void picksReadySellerWhoseTwinIsAlreadyBusy() {
// 2 READY records; one seller is already active in the runtime. Advisor
// must return the other (still-idle) seller.
- BannerModSettlementMarketState state = new BannerModSettlementMarketState(
+ SettlementMarketState state = new SettlementMarketState(
2, 2, 0, 0, 2, 2,
List.of(),
List.of(
- new BannerModSettlementSellerDispatchRecord(
- SELLER_A, MARKET_A, "MarketA", BannerModSettlementSellerDispatchState.READY),
- new BannerModSettlementSellerDispatchRecord(
- SELLER_B, MARKET_B, "MarketB", BannerModSettlementSellerDispatchState.READY)
+ new SettlementSellerDispatchRecord(
+ SELLER_A, MARKET_A, "MarketA", SettlementSellerDispatchState.READY),
+ new SettlementSellerDispatchRecord(
+ SELLER_B, MARKET_B, "MarketB", SettlementSellerDispatchState.READY)
)
);
BannerModSellerDispatchRuntime runtime = new BannerModSellerDispatchRuntime();
@@ -45,20 +45,20 @@ void picksReadySellerWhoseTwinIsAlreadyBusy() {
void emptyStateReturnsEmpty() {
BannerModSellerDispatchRuntime runtime = new BannerModSellerDispatchRuntime();
Optional<UUID> picked = BannerModSellerDispatchAdvisor.pickReadySeller(
- BannerModSettlementMarketState.empty(), runtime, 0L);
+ SettlementMarketState.empty(), runtime, 0L);
assertTrue(picked.isEmpty());
}
@Test
void allSellersBusyReturnsEmpty() {
- BannerModSettlementMarketState state = new BannerModSettlementMarketState(
+ SettlementMarketState state = new SettlementMarketState(
2, 2, 0, 0, 2, 2,
List.of(),
List.of(
- new BannerModSettlementSellerDispatchRecord(
- SELLER_A, MARKET_A, "MarketA", BannerModSettlementSellerDispatchState.READY),
- new BannerModSettlementSellerDispatchRecord(
- SELLER_B, MARKET_B, "MarketB", BannerModSettlementSellerDispatchState.READY)
+ new SettlementSellerDispatchRecord(
+ SELLER_A, MARKET_A, "MarketA", SettlementSellerDispatchState.READY),
+ new SettlementSellerDispatchRecord(
+ SELLER_B, MARKET_B, "MarketB", SettlementSellerDispatchState.READY)
)
);
BannerModSellerDispatchRuntime runtime = new BannerModSellerDispatchRuntime();
@@ -71,12 +71,12 @@ void allSellersBusyReturnsEmpty() {
@Test
void marketClosedSeedsAreNotConsidered() {
- BannerModSettlementMarketState state = new BannerModSettlementMarketState(
+ SettlementMarketState state = new SettlementMarketState(
1, 0, 0, 0, 1, 0,
List.of(),
List.of(
- new BannerModSettlementSellerDispatchRecord(
- SELLER_A, MARKET_A, "MarketA", BannerModSettlementSellerDispatchState.MARKET_CLOSED)
+ new SettlementSellerDispatchRecord(
+ SELLER_A, MARKET_A, "MarketA", SettlementSellerDispatchState.MARKET_CLOSED)
)
);
BannerModSellerDispatchRuntime runtime = new BannerModSellerDispatchRuntime();
@@ -87,14 +87,14 @@ void marketClosedSeedsAreNotConsidered() {
@Test
void iterationOrderMatchesRecordList() {
// Deterministic: first READY, idle seller in list order wins.
- BannerModSettlementMarketState state = new BannerModSettlementMarketState(
+ SettlementMarketState state = new SettlementMarketState(
2, 2, 0, 0, 2, 2,
List.of(),
List.of(
- new BannerModSettlementSellerDispatchRecord(
- SELLER_B, MARKET_B, "MarketB", BannerModSettlementSellerDispatchState.READY),
- new BannerModSettlementSellerDispatchRecord(
- SELLER_A, MARKET_A, "MarketA", BannerModSettlementSellerDispatchState.READY)
+ new SettlementSellerDispatchRecord(
+ SELLER_B, MARKET_B, "MarketB", SettlementSellerDispatchState.READY),
+ new SettlementSellerDispatchRecord(
+ SELLER_A, MARKET_A, "MarketA", SettlementSellerDispatchState.READY)
)
);
BannerModSellerDispatchRuntime runtime = new BannerModSellerDispatchRuntime();
@@ -108,6 +108,6 @@ void nullInputsReturnEmpty() {
BannerModSellerDispatchRuntime runtime = new BannerModSellerDispatchRuntime();
assertTrue(BannerModSellerDispatchAdvisor.pickReadySeller(null, runtime, 0L).isEmpty());
assertTrue(BannerModSellerDispatchAdvisor.pickReadySeller(
- BannerModSettlementMarketState.empty(), null, 0L).isEmpty());
+ SettlementMarketState.empty(), null, 0L).isEmpty());
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalSchedulerTest.java b/src/test/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalSchedulerTest.java
index cfd56756..3c86c44e 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalSchedulerTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/goal/BannerModResidentGoalSchedulerTest.java
@@ -1,17 +1,17 @@
package com.talhanation.bannermod.settlement.goal;
import com.talhanation.bannermod.bootstrap.BannerModMain;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentMode;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRole;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRuntimeRoleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentServiceContract;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSellerDispatchState;
-import com.talhanation.bannermod.settlement.BannerModSettlementServiceActorState;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentMode;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementResidentRole;
+import com.talhanation.bannermod.settlement.SettlementResidentRuntimeRoleState;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentServiceContract;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchRecord;
+import com.talhanation.bannermod.settlement.SettlementSellerDispatchState;
+import com.talhanation.bannermod.settlement.SettlementServiceActorState;
import com.talhanation.bannermod.settlement.dispatch.BannerModSellerDispatchRuntime;
import com.talhanation.bannermod.settlement.dispatch.SellerResidentGoal;
import com.talhanation.bannermod.settlement.goal.impl.IdleResidentGoal;
@@ -40,7 +40,7 @@ class BannerModResidentGoalSchedulerTest {
@Test
void activePhaseLocalWorkerSelectsWorkGoalOverIdleFallback() {
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals();
- BannerModSettlementResidentRecord worker = buildLocalWorker();
+ SettlementResidentRecord worker = buildLocalWorker();
ResidentGoalContext ctx = new ResidentGoalContext(worker, null, DAY_TICK_ACTIVE);
scheduler.tick(ctx);
@@ -53,7 +53,7 @@ void activePhaseLocalWorkerSelectsWorkGoalOverIdleFallback() {
@Test
void nightTickSelectsRestOverIdle() {
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals();
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
ResidentGoalContext ctx = new ResidentGoalContext(resident, null, DAY_TICK_NIGHT);
scheduler.tick(ctx);
@@ -66,7 +66,7 @@ void nightTickSelectsRestOverIdle() {
@Test
void unassignedVillagerInDaylightFlexSocialisesRatherThanWorks() {
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals();
- BannerModSettlementResidentRecord resident = buildUnassignedVillager();
+ SettlementResidentRecord resident = buildUnassignedVillager();
ResidentGoalContext ctx = new ResidentGoalContext(resident, null, DAY_TICK_ACTIVE);
scheduler.tick(ctx);
@@ -80,7 +80,7 @@ void unassignedVillagerInDaylightFlexSocialisesRatherThanWorks() {
@Test
void schedulerWithOnlyIdleGoalReturnsIdleTask() {
BannerModResidentGoalScheduler scheduler = new BannerModResidentGoalScheduler(List.of(new IdleResidentGoal()));
- BannerModSettlementResidentRecord resident = buildUnassignedVillager();
+ SettlementResidentRecord resident = buildUnassignedVillager();
scheduler.tick(new ResidentGoalContext(resident, null, DAY_TICK_ACTIVE));
@@ -93,7 +93,7 @@ void schedulerWithOnlyIdleGoalReturnsIdleTask() {
void activeTaskAdvancesUntilMaxTicksThenTimesOut() {
ResidentGoal fastGoal = new FixedDurationTestGoal("test/goal/fast", 50, 3, false);
BannerModResidentGoalScheduler scheduler = new BannerModResidentGoalScheduler(List.of(fastGoal));
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
UUID id = resident.residentUuid();
scheduler.tick(new ResidentGoalContext(resident, null, 100L));
@@ -114,7 +114,7 @@ void cooldownSkipsSameGoalAfterCompletion() {
ResidentGoal coolingGoal = new FixedDurationTestGoal("test/goal/cooling", 99, 2, true);
ResidentGoal fallback = new FixedDurationTestGoal("test/goal/fallback", 1, 1, false);
BannerModResidentGoalScheduler scheduler = new BannerModResidentGoalScheduler(List.of(coolingGoal, fallback));
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
UUID id = resident.residentUuid();
scheduler.tick(new ResidentGoalContext(resident, null, 200L));
@@ -133,7 +133,7 @@ void tieBreakFallsBackToLexicographicIdOrder() {
ResidentGoal goalZ = new FixedDurationTestGoal("test/goal/z", 40, 5, false);
ResidentGoal goalA = new FixedDurationTestGoal("test/goal/a", 40, 5, false);
BannerModResidentGoalScheduler scheduler = new BannerModResidentGoalScheduler(List.of(goalZ, goalA));
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
scheduler.tick(new ResidentGoalContext(resident, null, 300L));
@@ -146,7 +146,7 @@ void tieBreakFallsBackToLexicographicIdOrder() {
@Test
void forceStopMarksTaskDoneWithProvidedReason() {
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals();
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
UUID id = resident.residentUuid();
scheduler.tick(new ResidentGoalContext(resident, null, DAY_TICK_ACTIVE));
@@ -161,7 +161,7 @@ void forceStopMarksTaskDoneWithProvidedReason() {
@Test
void resetClearsActiveTasksAndCooldowns() {
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals();
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
UUID id = resident.residentUuid();
scheduler.tick(new ResidentGoalContext(resident, null, DAY_TICK_ACTIVE));
assertNotNull(scheduler.currentTask(id).orElse(null));
@@ -177,10 +177,10 @@ void extendedDefaultGoalsPickGoHomeWhenResidentHasHomeBindingAtNight() {
BannerModSellerDispatchRuntime sellerRuntime = new BannerModSellerDispatchRuntime();
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals(
homeRuntime,
- BannerModSettlementMarketState::empty,
+ SettlementMarketState::empty,
sellerRuntime
);
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
homeRuntime.assign(
resident.residentUuid(),
UUID.fromString("00000000-0000-0000-0000-0000000000b1"),
@@ -199,9 +199,9 @@ void extendedDefaultGoalsPickGoHomeWhenResidentHasHomeBindingAtNight() {
void extendedDefaultGoalsPickSellerOverWorkWhenReadyDispatchExists() {
BannerModHomeAssignmentRuntime homeRuntime = new BannerModHomeAssignmentRuntime();
BannerModSellerDispatchRuntime sellerRuntime = new BannerModSellerDispatchRuntime();
- BannerModSettlementResidentRecord seller = buildMarketSeller();
+ SettlementResidentRecord seller = buildMarketSeller();
UUID marketUuid = UUID.fromString("00000000-0000-0000-0000-0000000000c1");
- BannerModSettlementMarketState marketState = new BannerModSettlementMarketState(
+ SettlementMarketState marketState = new SettlementMarketState(
1,
1,
16,
@@ -209,11 +209,11 @@ void extendedDefaultGoalsPickSellerOverWorkWhenReadyDispatchExists() {
1,
1,
List.of(),
- List.of(new BannerModSettlementSellerDispatchRecord(
+ List.of(new SettlementSellerDispatchRecord(
seller.residentUuid(),
marketUuid,
"market",
- BannerModSettlementSellerDispatchState.READY
+ SettlementSellerDispatchState.READY
))
);
BannerModResidentGoalScheduler scheduler = BannerModResidentGoalScheduler.withDefaultGoals(
@@ -234,7 +234,7 @@ void extendedDefaultGoalsPickSellerOverWorkWhenReadyDispatchExists() {
void zeroPriorityGoalIsNotSelectedEvenIfCanStartReturnsTrue() {
ResidentGoal zeroPriority = new FixedDurationTestGoal("test/goal/zero", 0, 5, false);
BannerModResidentGoalScheduler scheduler = new BannerModResidentGoalScheduler(List.of(zeroPriority));
- BannerModSettlementResidentRecord resident = buildLocalWorker();
+ SettlementResidentRecord resident = buildLocalWorker();
scheduler.tick(new ResidentGoalContext(resident, null, 10L));
@@ -245,57 +245,57 @@ void zeroPriorityGoalIsNotSelectedEvenIfCanStartReturnsTrue() {
// Helpers
// ------------------------------------------------------------------
- private static BannerModSettlementResidentRecord buildLocalWorker() {
+ private static SettlementResidentRecord buildLocalWorker() {
UUID id = UUID.fromString("00000000-0000-0000-0000-000000000001");
UUID workArea = UUID.fromString("00000000-0000-0000-0000-000000000099");
- return new BannerModSettlementResidentRecord(
+ return new SettlementResidentRecord(
id,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.fromString("00000000-0000-0000-0000-0000000000aa"),
"teamA",
workArea,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
);
}
- private static BannerModSettlementResidentRecord buildUnassignedVillager() {
+ private static SettlementResidentRecord buildUnassignedVillager() {
UUID id = UUID.fromString("00000000-0000-0000-0000-000000000002");
- return new BannerModSettlementResidentRecord(
+ return new SettlementResidentRecord(
id,
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
null,
null,
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE
);
}
- private static BannerModSettlementResidentRecord buildMarketSeller() {
+ private static SettlementResidentRecord buildMarketSeller() {
UUID id = UUID.fromString("00000000-0000-0000-0000-000000000003");
UUID marketBuilding = UUID.fromString("00000000-0000-0000-0000-0000000000d1");
- return new BannerModSettlementResidentRecord(
+ return new SettlementResidentRecord(
id,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ new SettlementResidentServiceContract(
+ SettlementServiceActorState.LOCAL_BUILDING_SERVICE,
marketBuilding,
"market"
),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.fromString("00000000-0000-0000-0000-0000000000ab"),
"teamA",
marketBuilding,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
);
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContextTest.java b/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContextTest.java
index 7622542c..699aabc6 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContextTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthContextTest.java
@@ -1,14 +1,14 @@
package com.talhanation.bannermod.settlement.growth;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodsSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementStockpileSummary;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignalState;
-import com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodSnapshot;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodsSnapshot;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementStockpileSummary;
+import com.talhanation.bannermod.settlement.SettlementSupplySignalState;
+import com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -19,11 +19,11 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class BannerModSettlementGrowthContextTest {
+class SettlementGrowthContextTest {
@Test
void constructorNormalizesNullSeedsAndNegativeCounts() {
- BannerModSettlementGrowthContext ctx = new BannerModSettlementGrowthContext(
+ SettlementGrowthContext ctx = new SettlementGrowthContext(
null,
null,
null,
@@ -40,12 +40,12 @@ void constructorNormalizesNullSeedsAndNegativeCounts() {
7L
);
- assertEquals(BannerModSettlementProjectCandidateSeed.empty(), ctx.projectCandidateSeed());
- assertEquals(BannerModSettlementDesiredGoodsSeed.empty(), ctx.desiredGoodsSeed());
- assertEquals(BannerModSettlementStockpileSummary.empty(), ctx.stockpileSummary());
- assertEquals(BannerModSettlementMarketState.empty(), ctx.marketState());
- assertEquals(BannerModSettlementTradeRouteHandoffSeed.empty(), ctx.tradeRouteHandoffSeed());
- assertEquals(BannerModSettlementSupplySignalState.empty(), ctx.supplySignalState());
+ assertEquals(SettlementProjectCandidateSnapshot.empty(), ctx.projectCandidateSnapshot());
+ assertEquals(SettlementDesiredGoodsSnapshot.empty(), ctx.desiredGoodsSnapshot());
+ assertEquals(SettlementStockpileSummary.empty(), ctx.stockpileSummary());
+ assertEquals(SettlementMarketState.empty(), ctx.marketState());
+ assertEquals(SettlementTradeRouteHandoffSnapshot.empty(), ctx.tradeRouteHandoffSnapshot());
+ assertEquals(SettlementSupplySignalState.empty(), ctx.supplySignalState());
assertTrue(ctx.buildings().isEmpty());
assertTrue(ctx.residents().isEmpty());
assertEquals(0, ctx.residentCapacity());
@@ -58,15 +58,15 @@ void constructorNormalizesNullSeedsAndNegativeCounts() {
@Test
void fromSnapshotCopiesSnapshotFieldsAndCalculatesHeadroom() {
- BannerModSettlementSnapshot snapshot = snapshot(3, 1, 2, 1);
+ SettlementSnapshot snapshot = snapshot(3, 1, 2, 1);
- BannerModSettlementGrowthContext ctx = BannerModSettlementGrowthContext.fromSnapshot(snapshot, 55L);
+ SettlementGrowthContext ctx = SettlementGrowthContext.fromSnapshot(snapshot, 55L);
- assertEquals(snapshot.projectCandidateSeed(), ctx.projectCandidateSeed());
- assertEquals(snapshot.desiredGoodsSeed(), ctx.desiredGoodsSeed());
+ assertEquals(snapshot.projectCandidateSnapshot(), ctx.projectCandidateSnapshot());
+ assertEquals(snapshot.desiredGoodsSnapshot(), ctx.desiredGoodsSnapshot());
assertEquals(snapshot.stockpileSummary(), ctx.stockpileSummary());
assertEquals(snapshot.marketState(), ctx.marketState());
- assertEquals(snapshot.tradeRouteHandoffSeed(), ctx.tradeRouteHandoffSeed());
+ assertEquals(snapshot.tradeRouteHandoffSnapshot(), ctx.tradeRouteHandoffSnapshot());
assertEquals(snapshot.supplySignalState(), ctx.supplySignalState());
assertEquals(2, ctx.housingHeadroom());
assertEquals(55L, ctx.gameTime());
@@ -97,18 +97,18 @@ void fromSnapshotDetectsUnderSiegeCaseInsensitivelyAndRejectsNullSnapshot() {
List.of()
);
- BannerModSettlementGrowthContext ctx = BannerModSettlementGrowthContext.fromSnapshot(snapshot(0, 0, 0, 0), governorSnapshot, 10L);
+ SettlementGrowthContext ctx = SettlementGrowthContext.fromSnapshot(snapshot(0, 0, 0, 0), governorSnapshot, 10L);
assertTrue(ctx.isUnderSiege());
assertEquals(governorSnapshot, ctx.governorSnapshot());
- assertThrows(IllegalArgumentException.class, () -> BannerModSettlementGrowthContext.fromSnapshot(null, 10L));
+ assertThrows(IllegalArgumentException.class, () -> SettlementGrowthContext.fromSnapshot(null, 10L));
}
- private static BannerModSettlementSnapshot snapshot(int residentCapacity,
+ private static SettlementSnapshot snapshot(int residentCapacity,
int assignedResidentCount,
int unassignedWorkerCount,
int missingWorkAreaAssignmentCount) {
- return new BannerModSettlementSnapshot(
+ return new SettlementSnapshot(
UUID.randomUUID(),
0,
0,
@@ -120,19 +120,19 @@ private static BannerModSettlementSnapshot snapshot(int residentCapacity,
missingWorkAreaAssignmentCount,
0,
0,
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- new BannerModSettlementDesiredGoodsSeed(List.of(new BannerModSettlementDesiredGoodSeed("food", 2))),
- new BannerModSettlementProjectCandidateSeed(
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ new SettlementDesiredGoodsSnapshot(List.of(new SettlementDesiredGoodSnapshot("food", 2))),
+ new SettlementProjectCandidateSnapshot(
"seed",
- com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed.GENERAL,
+ com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed.GENERAL,
2,
true,
true,
List.of("housing_pressure")
),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(),
List.of()
);
diff --git a/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManagerTest.java b/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManagerTest.java
index 3773ea4c..1843e1d3 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManagerTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/growth/BannerModSettlementGrowthManagerTest.java
@@ -1,16 +1,16 @@
package com.talhanation.bannermod.settlement.growth;
import com.talhanation.bannermod.governance.BannerModGovernorSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodsSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementStockpileSummary;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignal;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignalState;
-import com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodSnapshot;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodsSnapshot;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot;
+import com.talhanation.bannermod.settlement.SettlementStockpileSummary;
+import com.talhanation.bannermod.settlement.SettlementSupplySignal;
+import com.talhanation.bannermod.settlement.SettlementSupplySignalState;
+import com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -24,119 +24,119 @@
import java.util.UUID;
-class BannerModSettlementGrowthManagerTest {
+class SettlementGrowthManagerTest {
- private static final BannerModSettlementMarketState NON_EMPTY_MARKET =
- new BannerModSettlementMarketState(1, 1, 0, 0, 0, 0, List.of(), List.of());
+ private static final SettlementMarketState NON_EMPTY_MARKET =
+ new SettlementMarketState(1, 1, 0, 0, 0, 0, List.of(), List.of());
@Test
void emptySnapshotYieldsEmptyQueue() {
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(emptyContext(), 8);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(emptyContext(), 8);
assertTrue(queue.isEmpty(), "empty context should produce no candidates");
}
@Test
void housingShortageYieldsNewBuildingInGeneralCategory() {
// Residents exceed capacity and workers are unassigned → housing pressure.
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementMarketState.empty(),
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementMarketState.empty(),
2, 2, 3,
100L
);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
assertFalse(queue.isEmpty(), "saturated settlement should have a housing candidate");
PendingProject top = queue.get(0);
assertEquals(ProjectKind.NEW_BUILDING, top.kind());
// Housing currently falls under GENERAL since no dedicated category exists.
- assertEquals(BannerModSettlementBuildingCategory.GENERAL, top.buildingCategory());
- assertSame(BannerModSettlementBuildingProfileSeed.GENERAL, top.profileSeed());
+ assertEquals(SettlementBuildingCategory.GENERAL, top.buildingCategory());
+ assertSame(SettlementBuildingProfileSeed.GENERAL, top.profileSeed());
}
@Test
void desiredGoodShortagePrioritisesMatchingProducer() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 5)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 5)
));
- BannerModSettlementProjectCandidateSeed seed = new BannerModSettlementProjectCandidateSeed(
- "seed", BannerModSettlementBuildingProfileSeed.STORAGE, 0, false, false, List.of()
+ SettlementProjectCandidateSnapshot seed = new SettlementProjectCandidateSnapshot(
+ "seed", SettlementBuildingProfileSeed.STORAGE, 0, false, false, List.of()
);
- BannerModSettlementGrowthContext ctx = ctxOf(seed, desired, NON_EMPTY_MARKET, 0, 0, 0, 0L);
+ SettlementGrowthContext ctx = ctxOf(seed, desired, NON_EMPTY_MARKET, 0, 0, 0, 0L);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
assertFalse(queue.isEmpty());
PendingProject top = queue.get(0);
- assertSame(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, top.profileSeed());
- assertEquals(BannerModSettlementBuildingCategory.FOOD, top.buildingCategory());
+ assertSame(SettlementBuildingProfileSeed.FOOD_PRODUCTION, top.profileSeed());
+ assertEquals(SettlementBuildingCategory.FOOD, top.buildingCategory());
}
@Test
- void reservationAwareHintsCanSeedDemandWithoutDesiredGoodsSeed() {
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed = new BannerModSettlementTradeRouteHandoffSeed(
+ void reservationAwareHintsCanCreateDemandWithoutDesiredGoodsSnapshot() {
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot = new SettlementTradeRouteHandoffSnapshot(
1, 1, 0, 0, 2, 12,
- List.of(new BannerModSettlementDesiredGoodSeed("market_goods", 0)),
+ List.of(new SettlementDesiredGoodSnapshot("market_goods", 0)),
List.of(),
List.of()
);
- BannerModSettlementSupplySignalState supplySignalState = new BannerModSettlementSupplySignalState(
+ SettlementSupplySignalState supplySignalState = new SettlementSupplySignalState(
1, 0, 0, 8,
- List.of(new BannerModSettlementSupplySignal("market_goods", 0, 0, 0, 8))
+ List.of(new SettlementSupplySignal("market_goods", 0, 0, 0, 8))
);
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
NON_EMPTY_MARKET,
- tradeRouteHandoffSeed,
+ tradeRouteHandoffSnapshot,
supplySignalState,
0, 0, 0, 0L
);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
assertFalse(queue.isEmpty());
- assertSame(BannerModSettlementBuildingProfileSeed.MARKET, queue.get(0).profileSeed());
+ assertSame(SettlementBuildingProfileSeed.MARKET, queue.get(0).profileSeed());
}
@Test
void concreteSupplyShortageOutranksBroadDesiredDemand() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("market_goods", 8)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("market_goods", 8)
));
- BannerModSettlementSupplySignalState supplySignalState = new BannerModSettlementSupplySignalState(
+ SettlementSupplySignalState supplySignalState = new SettlementSupplySignalState(
1, 1, 2, 0,
- List.of(new BannerModSettlementSupplySignal("food", 1, 0, 2, 0))
+ List.of(new SettlementSupplySignal("food", 1, 0, 2, 0))
);
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
desired,
NON_EMPTY_MARKET,
- BannerModSettlementTradeRouteHandoffSeed.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
supplySignalState,
0, 0, 0, 77L
);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
assertFalse(queue.isEmpty());
- assertSame(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, queue.get(0).profileSeed());
+ assertSame(SettlementBuildingProfileSeed.FOOD_PRODUCTION, queue.get(0).profileSeed());
}
@Test
void sameGrowthProfileKeepsStableProjectIdAcrossTicks() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 2)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 2)
));
- BannerModSettlementGrowthContext early = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 10L);
- BannerModSettlementGrowthContext late = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 200L);
+ SettlementGrowthContext early = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 10L);
+ SettlementGrowthContext late = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 200L);
- PendingProject first = BannerModSettlementGrowthManager.pickNextProject(early).orElseThrow();
- PendingProject second = BannerModSettlementGrowthManager.pickNextProject(late).orElseThrow();
+ PendingProject first = SettlementGrowthManager.pickNextProject(early).orElseThrow();
+ PendingProject second = SettlementGrowthManager.pickNextProject(late).orElseThrow();
assertEquals(first.projectId(), second.projectId());
assertNotEquals(first.proposedAtGameTime(), second.proposedAtGameTime());
@@ -144,141 +144,141 @@ void sameGrowthProfileKeepsStableProjectIdAcrossTicks() {
@Test
void pickNextProjectMirrorsTopOfQueue() {
- assertEquals(Optional.empty(), BannerModSettlementGrowthManager.pickNextProject(emptyContext()));
+ assertEquals(Optional.empty(), SettlementGrowthManager.pickNextProject(emptyContext()));
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("materials", 2)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("materials", 2)
));
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 42L);
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 42L);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
- Optional<PendingProject> next = BannerModSettlementGrowthManager.pickNextProject(ctx);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ Optional<PendingProject> next = SettlementGrowthManager.pickNextProject(ctx);
assertTrue(next.isPresent());
assertEquals(queue.get(0), next.get());
}
@Test
void maxQueueSizeZeroReturnsEmptyList() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 3),
- new BannerModSettlementDesiredGoodSeed("materials", 3)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 3),
+ new SettlementDesiredGoodSnapshot("materials", 3)
));
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 0L);
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 0L);
- assertTrue(BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 0).isEmpty());
- assertTrue(BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, -1).isEmpty());
+ assertTrue(SettlementGrowthManager.evaluateGrowthQueue(ctx, 0).isEmpty());
+ assertTrue(SettlementGrowthManager.evaluateGrowthQueue(ctx, -1).isEmpty());
}
@Test
void tieBreakIsDeterministicOnOrdinalThenHash() {
// "food" and "materials" both have driverCount=1 => identical base score.
// FOOD (ordinal 0) precedes MATERIAL (ordinal 1), so the food candidate wins.
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 1),
- new BannerModSettlementDesiredGoodSeed("materials", 1)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 1),
+ new SettlementDesiredGoodSnapshot("materials", 1)
));
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 7L);
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(), desired, NON_EMPTY_MARKET, 0, 0, 0, 7L);
- List<PendingProject> first = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
- List<PendingProject> second = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> first = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> second = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
assertEquals(first, second, "deterministic ordering expected across invocations");
assertTrue(first.size() >= 2);
assertEquals(first.get(0).priorityScore(), first.get(1).priorityScore(),
"first two candidates must be a genuine tie on score for this test");
- assertSame(BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, first.get(0).profileSeed());
- assertSame(BannerModSettlementBuildingProfileSeed.MATERIAL_PRODUCTION, first.get(1).profileSeed());
+ assertSame(SettlementBuildingProfileSeed.FOOD_PRODUCTION, first.get(0).profileSeed());
+ assertSame(SettlementBuildingProfileSeed.MATERIAL_PRODUCTION, first.get(1).profileSeed());
assertNotEquals(first.get(0), first.get(1));
}
@Test
void governorPriorityCanCreateConstructionCandidateWithoutOtherDemand() {
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementMarketState.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementMarketState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
0, 0, 0,
governorSnapshot(2, 3, List.of()),
15L
);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
assertEquals(1, queue.size());
- assertSame(BannerModSettlementBuildingProfileSeed.CONSTRUCTION, queue.get(0).profileSeed());
+ assertSame(SettlementBuildingProfileSeed.CONSTRUCTION, queue.get(0).profileSeed());
assertEquals(ProjectBlocker.NONE, queue.get(0).blockerReason());
}
@Test
void governorPriorityBoostsExistingConstructionDemandInsteadOfReplacingIt() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("construction_materials", 1)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("construction_materials", 1)
));
- BannerModSettlementGrowthContext baseline = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
+ SettlementGrowthContext baseline = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
desired,
NON_EMPTY_MARKET,
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
0, 0, 0,
null,
40L
);
- BannerModSettlementGrowthContext boosted = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
+ SettlementGrowthContext boosted = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
desired,
NON_EMPTY_MARKET,
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
0, 0, 0,
governorSnapshot(1, 2, List.of()),
40L
);
- PendingProject baselineProject = BannerModSettlementGrowthManager.pickNextProject(baseline).orElseThrow();
- PendingProject boostedProject = BannerModSettlementGrowthManager.pickNextProject(boosted).orElseThrow();
+ PendingProject baselineProject = SettlementGrowthManager.pickNextProject(baseline).orElseThrow();
+ PendingProject boostedProject = SettlementGrowthManager.pickNextProject(boosted).orElseThrow();
- assertSame(BannerModSettlementBuildingProfileSeed.CONSTRUCTION, baselineProject.profileSeed());
- assertSame(BannerModSettlementBuildingProfileSeed.CONSTRUCTION, boostedProject.profileSeed());
+ assertSame(SettlementBuildingProfileSeed.CONSTRUCTION, baselineProject.profileSeed());
+ assertSame(SettlementBuildingProfileSeed.CONSTRUCTION, boostedProject.profileSeed());
assertTrue(boostedProject.priorityScore() > baselineProject.priorityScore());
}
@Test
void siegeAddsDefensiveFallbackAndBlocksCivilianExpansion() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("food", 2)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("food", 2)
));
- BannerModSettlementGrowthContext ctx = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
+ SettlementGrowthContext ctx = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
desired,
NON_EMPTY_MARKET,
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
0, 0, 0,
governorSnapshot(0, 0, List.of("Under_Siege")),
99L
);
- List<PendingProject> queue = BannerModSettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
- PendingProject foodProject = projectFor(queue, BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION).orElseThrow();
+ List<PendingProject> queue = SettlementGrowthManager.evaluateGrowthQueue(ctx, 4);
+ PendingProject foodProject = projectFor(queue, SettlementBuildingProfileSeed.FOOD_PRODUCTION).orElseThrow();
assertFalse(queue.isEmpty());
- assertSame(BannerModSettlementBuildingProfileSeed.CONSTRUCTION, queue.get(0).profileSeed());
+ assertSame(SettlementBuildingProfileSeed.CONSTRUCTION, queue.get(0).profileSeed());
assertEquals(ProjectBlocker.NONE, queue.get(0).blockerReason());
assertEquals(ProjectBlocker.UNDER_SIEGE, foodProject.blockerReason());
}
@Test
void tradeRouteDemandBonusAmplifiesStorageAndMarketScoring() {
- BannerModSettlementDesiredGoodsSeed desired = new BannerModSettlementDesiredGoodsSeed(List.of(
- new BannerModSettlementDesiredGoodSeed("storage_type:merchants", 1),
- new BannerModSettlementDesiredGoodSeed("trade_stock", 1)
+ SettlementDesiredGoodsSnapshot desired = new SettlementDesiredGoodsSnapshot(List.of(
+ new SettlementDesiredGoodSnapshot("storage_type:merchants", 1),
+ new SettlementDesiredGoodSnapshot("trade_stock", 1)
));
- BannerModSettlementTradeRouteHandoffSeed boostedHandoff = new BannerModSettlementTradeRouteHandoffSeed(
+ SettlementTradeRouteHandoffSnapshot boostedHandoff = new SettlementTradeRouteHandoffSnapshot(
1,
1,
2,
@@ -289,72 +289,72 @@ void tradeRouteDemandBonusAmplifiesStorageAndMarketScoring() {
List.of(),
List.of()
);
- BannerModSettlementGrowthContext baseline = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
+ SettlementGrowthContext baseline = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
desired,
NON_EMPTY_MARKET,
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
0, 0, 0,
null,
0L
);
- BannerModSettlementGrowthContext boosted = ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
+ SettlementGrowthContext boosted = ctxOf(
+ SettlementProjectCandidateSnapshot.empty(),
desired,
NON_EMPTY_MARKET,
boostedHandoff,
- BannerModSettlementSupplySignalState.empty(),
+ SettlementSupplySignalState.empty(),
0, 0, 0,
null,
0L
);
- List<PendingProject> baselineQueue = BannerModSettlementGrowthManager.evaluateGrowthQueue(baseline, 4);
- List<PendingProject> boostedQueue = BannerModSettlementGrowthManager.evaluateGrowthQueue(boosted, 4);
+ List<PendingProject> baselineQueue = SettlementGrowthManager.evaluateGrowthQueue(baseline, 4);
+ List<PendingProject> boostedQueue = SettlementGrowthManager.evaluateGrowthQueue(boosted, 4);
- assertTrue(projectFor(boostedQueue, BannerModSettlementBuildingProfileSeed.STORAGE).orElseThrow().priorityScore()
- > projectFor(baselineQueue, BannerModSettlementBuildingProfileSeed.STORAGE).orElseThrow().priorityScore());
- assertTrue(projectFor(boostedQueue, BannerModSettlementBuildingProfileSeed.MARKET).orElseThrow().priorityScore()
- > projectFor(baselineQueue, BannerModSettlementBuildingProfileSeed.MARKET).orElseThrow().priorityScore());
+ assertTrue(projectFor(boostedQueue, SettlementBuildingProfileSeed.STORAGE).orElseThrow().priorityScore()
+ > projectFor(baselineQueue, SettlementBuildingProfileSeed.STORAGE).orElseThrow().priorityScore());
+ assertTrue(projectFor(boostedQueue, SettlementBuildingProfileSeed.MARKET).orElseThrow().priorityScore()
+ > projectFor(baselineQueue, SettlementBuildingProfileSeed.MARKET).orElseThrow().priorityScore());
}
- private static BannerModSettlementGrowthContext emptyContext() {
+ private static SettlementGrowthContext emptyContext() {
return ctxOf(
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementMarketState.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementMarketState.empty(),
0, 0, 0, 0L
);
}
- private static BannerModSettlementGrowthContext ctxOf(
- BannerModSettlementProjectCandidateSeed seed,
- BannerModSettlementDesiredGoodsSeed desired,
- BannerModSettlementMarketState market,
+ private static SettlementGrowthContext ctxOf(
+ SettlementProjectCandidateSnapshot seed,
+ SettlementDesiredGoodsSnapshot desired,
+ SettlementMarketState market,
int residentCapacity,
int assignedResidentCount,
int unassignedWorkerCount,
long gameTime
) {
- return new BannerModSettlementGrowthContext(
+ return new SettlementGrowthContext(
seed, desired,
- BannerModSettlementStockpileSummary.empty(),
+ SettlementStockpileSummary.empty(),
market,
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(), List.of(),
residentCapacity, assignedResidentCount, unassignedWorkerCount, 0,
null, gameTime
);
}
- private static BannerModSettlementGrowthContext ctxOf(
- BannerModSettlementProjectCandidateSeed seed,
- BannerModSettlementDesiredGoodsSeed desired,
- BannerModSettlementMarketState market,
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed,
- BannerModSettlementSupplySignalState supplySignalState,
+ private static SettlementGrowthContext ctxOf(
+ SettlementProjectCandidateSnapshot seed,
+ SettlementDesiredGoodsSnapshot desired,
+ SettlementMarketState market,
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot,
+ SettlementSupplySignalState supplySignalState,
int residentCapacity,
int assignedResidentCount,
int unassignedWorkerCount,
@@ -364,7 +364,7 @@ private static BannerModSettlementGrowthContext ctxOf(
seed,
desired,
market,
- tradeRouteHandoffSeed,
+ tradeRouteHandoffSnapshot,
supplySignalState,
residentCapacity,
assignedResidentCount,
@@ -374,24 +374,24 @@ private static BannerModSettlementGrowthContext ctxOf(
);
}
- private static BannerModSettlementGrowthContext ctxOf(
- BannerModSettlementProjectCandidateSeed seed,
- BannerModSettlementDesiredGoodsSeed desired,
- BannerModSettlementMarketState market,
- BannerModSettlementTradeRouteHandoffSeed tradeRouteHandoffSeed,
- BannerModSettlementSupplySignalState supplySignalState,
+ private static SettlementGrowthContext ctxOf(
+ SettlementProjectCandidateSnapshot seed,
+ SettlementDesiredGoodsSnapshot desired,
+ SettlementMarketState market,
+ SettlementTradeRouteHandoffSnapshot tradeRouteHandoffSnapshot,
+ SettlementSupplySignalState supplySignalState,
int residentCapacity,
int assignedResidentCount,
int unassignedWorkerCount,
BannerModGovernorSnapshot governorSnapshot,
long gameTime
) {
- return new BannerModSettlementGrowthContext(
+ return new SettlementGrowthContext(
seed,
desired,
- BannerModSettlementStockpileSummary.empty(),
+ SettlementStockpileSummary.empty(),
market,
- tradeRouteHandoffSeed,
+ tradeRouteHandoffSnapshot,
supplySignalState,
List.of(),
List.of(),
@@ -431,7 +431,7 @@ private static BannerModGovernorSnapshot governorSnapshot(int garrisonPriority,
}
private static Optional<PendingProject> projectFor(List<PendingProject> queue,
- BannerModSettlementBuildingProfileSeed profileSeed) {
+ SettlementBuildingProfileSeed profileSeed) {
return queue.stream().filter(project -> project.profileSeed() == profileSeed).findFirst();
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisorTest.java b/src/test/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisorTest.java
index 3665a446..c77f25fa 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisorTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/household/BannerModHomeAssignmentAdvisorTest.java
@@ -1,14 +1,14 @@
package com.talhanation.bannermod.settlement.household;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementDesiredGoodsSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementMarketState;
-import com.talhanation.bannermod.settlement.BannerModSettlementProjectCandidateSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
-import com.talhanation.bannermod.settlement.BannerModSettlementStockpileSummary;
-import com.talhanation.bannermod.settlement.BannerModSettlementSupplySignalState;
-import com.talhanation.bannermod.settlement.BannerModSettlementTradeRouteHandoffSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodsSnapshot;
+import com.talhanation.bannermod.settlement.SettlementMarketState;
+import com.talhanation.bannermod.settlement.SettlementProjectCandidateSnapshot;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementStockpileSummary;
+import com.talhanation.bannermod.settlement.SettlementSupplySignalState;
+import com.talhanation.bannermod.settlement.SettlementTradeRouteHandoffSnapshot;
import net.minecraft.core.BlockPos;
import org.junit.jupiter.api.Test;
@@ -30,11 +30,11 @@ void prefersHousingCategoryWithSpareCapacityAndSkipsCurrentOrFullHomes() {
runtime.assign(residentUuid, currentHome, HomePreference.ASSIGNED, 0L);
runtime.assign(UUID.randomUUID(), fullHome, HomePreference.ASSIGNED, 0L);
- BannerModSettlementSnapshot snapshot = snapshot(List.of(
- building(currentHome, BannerModSettlementBuildingProfileSeed.GENERAL, 2),
- building(fullHome, BannerModSettlementBuildingProfileSeed.GENERAL, 1),
- building(freeHome, BannerModSettlementBuildingProfileSeed.GENERAL, 2),
- building(UUID.randomUUID(), BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, 3)
+ SettlementSnapshot snapshot = snapshot(List.of(
+ building(currentHome, SettlementBuildingProfileSeed.GENERAL, 2),
+ building(fullHome, SettlementBuildingProfileSeed.GENERAL, 1),
+ building(freeHome, SettlementBuildingProfileSeed.GENERAL, 2),
+ building(UUID.randomUUID(), SettlementBuildingProfileSeed.FOOD_PRODUCTION, 3)
));
assertEquals(freeHome, BannerModHomeAssignmentAdvisor.pickHomeBuilding(residentUuid, snapshot, runtime).orElseThrow());
@@ -48,9 +48,9 @@ void fallsBackToAnyCategoryWhenNoGeneralHousingHasCapacity() {
BannerModHomeAssignmentRuntime runtime = new BannerModHomeAssignmentRuntime();
runtime.assign(UUID.randomUUID(), fullHome, HomePreference.ASSIGNED, 0L);
- BannerModSettlementSnapshot snapshot = snapshot(List.of(
- building(fullHome, BannerModSettlementBuildingProfileSeed.GENERAL, 1),
- building(shelter, BannerModSettlementBuildingProfileSeed.FOOD_PRODUCTION, 1)
+ SettlementSnapshot snapshot = snapshot(List.of(
+ building(fullHome, SettlementBuildingProfileSeed.GENERAL, 1),
+ building(shelter, SettlementBuildingProfileSeed.FOOD_PRODUCTION, 1)
));
assertEquals(shelter, BannerModHomeAssignmentAdvisor.pickHomeBuilding(residentUuid, snapshot, runtime).orElseThrow());
@@ -65,8 +65,8 @@ void nullAndEmptyInputsReturnEmpty() {
assertTrue(BannerModHomeAssignmentAdvisor.pickHomeBuilding(UUID.randomUUID(), snapshot(List.of()), runtime).isEmpty());
}
- private static BannerModSettlementSnapshot snapshot(List<BannerModSettlementBuildingRecord> buildings) {
- return new BannerModSettlementSnapshot(
+ private static SettlementSnapshot snapshot(List<SettlementBuildingRecord> buildings) {
+ return new SettlementSnapshot(
UUID.randomUUID(),
0,
0,
@@ -78,21 +78,21 @@ private static BannerModSettlementSnapshot snapshot(List<BannerModSettlementBuil
0,
0,
0,
- BannerModSettlementStockpileSummary.empty(),
- BannerModSettlementMarketState.empty(),
- BannerModSettlementDesiredGoodsSeed.empty(),
- BannerModSettlementProjectCandidateSeed.empty(),
- BannerModSettlementTradeRouteHandoffSeed.empty(),
- BannerModSettlementSupplySignalState.empty(),
+ SettlementStockpileSummary.empty(),
+ SettlementMarketState.empty(),
+ SettlementDesiredGoodsSnapshot.empty(),
+ SettlementProjectCandidateSnapshot.empty(),
+ SettlementTradeRouteHandoffSnapshot.empty(),
+ SettlementSupplySignalState.empty(),
List.of(),
buildings
);
}
- private static BannerModSettlementBuildingRecord building(UUID buildingUuid,
- BannerModSettlementBuildingProfileSeed profileSeed,
+ private static SettlementBuildingRecord building(UUID buildingUuid,
+ SettlementBuildingProfileSeed profileSeed,
int residentCapacity) {
- return new BannerModSettlementBuildingRecord(
+ return new SettlementBuildingRecord(
buildingUuid,
"bannermod:test_" + profileSeed.name().toLowerCase(),
BlockPos.ZERO,
diff --git a/src/test/java/com/talhanation/bannermod/settlement/household/HouseholdGoalsTest.java b/src/test/java/com/talhanation/bannermod/settlement/household/HouseholdGoalsTest.java
index 9b4a2aa3..9fad8917 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/household/HouseholdGoalsTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/household/HouseholdGoalsTest.java
@@ -1,13 +1,13 @@
package com.talhanation.bannermod.settlement.household;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentMode;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRole;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRuntimeRoleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleWindowSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentServiceContract;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentMode;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementResidentRole;
+import com.talhanation.bannermod.settlement.SettlementResidentRuntimeRoleState;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleWindowSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentServiceContract;
import com.talhanation.bannermod.settlement.goal.ResidentGoalContext;
import org.junit.jupiter.api.Test;
@@ -142,19 +142,19 @@ void startReturnsTasksWithExpectedDurations() {
// Helpers
// ------------------------------------------------------------------
- private static BannerModSettlementResidentRecord buildResident() {
- return new BannerModSettlementResidentRecord(
+ private static SettlementResidentRecord buildResident() {
+ return new SettlementResidentRecord(
RESIDENT_ID,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentScheduleWindowSeed.LABOR_DAY,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- BannerModSettlementResidentServiceContract.notServiceActor(),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentScheduleWindowSeed.LABOR_DAY,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ SettlementResidentServiceContract.notServiceActor(),
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.fromString("00000000-0000-0000-0000-0000000000cc"),
"teamA",
UUID.fromString("00000000-0000-0000-0000-0000000000dd"),
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
);
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistryTest.java b/src/test/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistryTest.java
index 98845bd4..1c90558d 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistryTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/job/JobHandlerRegistryTest.java
@@ -1,14 +1,14 @@
package com.talhanation.bannermod.settlement.job;
-import com.talhanation.bannermod.settlement.BannerModSettlementJobHandlerSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentMode;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRole;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRuntimeRoleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentServiceContract;
-import com.talhanation.bannermod.settlement.BannerModSettlementServiceActorState;
+import com.talhanation.bannermod.settlement.SettlementJobHandlerSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentMode;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementResidentRole;
+import com.talhanation.bannermod.settlement.SettlementResidentRuntimeRoleState;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentServiceContract;
+import com.talhanation.bannermod.settlement.SettlementServiceActorState;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrder;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderRuntime;
import com.talhanation.bannermod.settlement.workorder.SettlementWorkOrderStatus;
@@ -43,13 +43,13 @@ void defaultsRegistryExposesBothBuiltInHandlers() {
void lookupBySeedReturnsHandlerWhoseHandlesMatches() {
JobHandlerRegistry registry = JobHandlerRegistry.defaults();
- Optional<JobHandler> harvest = registry.lookup(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL);
- Optional<JobHandler> build = registry.lookup(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR);
+ Optional<JobHandler> harvest = registry.lookup(SettlementJobHandlerSeed.FLOATING_LABOR_POOL);
+ Optional<JobHandler> build = registry.lookup(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR);
assertTrue(harvest.isPresent());
assertTrue(build.isPresent());
- assertEquals(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL, harvest.get().handles());
- assertEquals(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, build.get().handles());
+ assertEquals(SettlementJobHandlerSeed.FLOATING_LABOR_POOL, harvest.get().handles());
+ assertEquals(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR, build.get().handles());
}
@Test
@@ -57,13 +57,13 @@ void registerCustomHandlerThenLookupByIdReturnsSameInstance() {
JobHandlerRegistry registry = new JobHandlerRegistry();
JobHandler custom = new TestJobHandler(
ResourceLocation.fromNamespaceAndPath("bannermod", "custom_governance"),
- BannerModSettlementJobHandlerSeed.GOVERNANCE
+ SettlementJobHandlerSeed.GOVERNANCE
);
registry.register(custom);
assertSame(custom, registry.lookupById(ResourceLocation.fromNamespaceAndPath("bannermod", "custom_governance")).orElse(null));
- assertSame(custom, registry.lookup(BannerModSettlementJobHandlerSeed.GOVERNANCE).orElse(null));
+ assertSame(custom, registry.lookup(SettlementJobHandlerSeed.GOVERNANCE).orElse(null));
}
@Test
@@ -71,18 +71,18 @@ void lastRegistrationWinsForSameSeed() {
JobHandlerRegistry registry = new JobHandlerRegistry();
JobHandler first = new TestJobHandler(
ResourceLocation.fromNamespaceAndPath("bannermod", "first"),
- BannerModSettlementJobHandlerSeed.VILLAGE_LIFE
+ SettlementJobHandlerSeed.VILLAGE_LIFE
);
JobHandler second = new TestJobHandler(
ResourceLocation.fromNamespaceAndPath("bannermod", "second"),
- BannerModSettlementJobHandlerSeed.VILLAGE_LIFE
+ SettlementJobHandlerSeed.VILLAGE_LIFE
);
registry.register(first);
registry.register(second);
// Seed binding reflects the most recent registration.
- assertSame(second, registry.lookup(BannerModSettlementJobHandlerSeed.VILLAGE_LIFE).orElse(null));
+ assertSame(second, registry.lookup(SettlementJobHandlerSeed.VILLAGE_LIFE).orElse(null));
// Both remain reachable by their distinct ids; we do not evict the older handler from
// the id index because its id was not reused.
assertSame(first, registry.lookupById(ResourceLocation.fromNamespaceAndPath("bannermod", "first")).orElse(null));
@@ -94,8 +94,8 @@ void lastRegistrationWinsForSameSeed() {
void lookupForUnregisteredSeedReturnsEmpty() {
JobHandlerRegistry registry = new JobHandlerRegistry();
- assertFalse(registry.lookup(BannerModSettlementJobHandlerSeed.ORPHANED_LABOR_RECOVERY).isPresent());
- assertFalse(registry.lookup(BannerModSettlementJobHandlerSeed.NONE).isPresent());
+ assertFalse(registry.lookup(SettlementJobHandlerSeed.ORPHANED_LABOR_RECOVERY).isPresent());
+ assertFalse(registry.lookup(SettlementJobHandlerSeed.NONE).isPresent());
assertFalse(registry.lookup(null).isPresent());
assertFalse(registry.lookupById(null).isPresent());
assertFalse(registry.lookupById(ResourceLocation.fromNamespaceAndPath("bannermod", "missing")).isPresent());
@@ -110,7 +110,7 @@ void clearEmptiesRegistry() {
assertEquals(0, registry.size());
assertTrue(registry.all().isEmpty());
- assertFalse(registry.lookup(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL).isPresent());
+ assertFalse(registry.lookup(SettlementJobHandlerSeed.FLOATING_LABOR_POOL).isPresent());
assertFalse(registry.lookupById(HarvestJobHandler.ID).isPresent());
}
@@ -124,8 +124,8 @@ void builtInHandlersAcceptProjectedControlledWorkerContext() {
UUID.randomUUID()
);
- JobHandler harvest = registry.lookup(BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL).orElseThrow();
- JobHandler build = registry.lookup(BannerModSettlementJobHandlerSeed.LOCAL_BUILDING_LABOR).orElseThrow();
+ JobHandler harvest = registry.lookup(SettlementJobHandlerSeed.FLOATING_LABOR_POOL).orElseThrow();
+ JobHandler build = registry.lookup(SettlementJobHandlerSeed.LOCAL_BUILDING_LABOR).orElseThrow();
assertTrue(harvest.canHandle(ctx));
assertTrue(build.canHandle(ctx));
@@ -149,7 +149,7 @@ void builtInHandlersRejectNonProjectedContext() {
@Test
void harvestHandlerClaimsHaulResourceOrderForFloatingLaborResident() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
- BannerModSettlementResidentRecord resident = sampleProjectedWorker();
+ SettlementResidentRecord resident = sampleProjectedWorker();
UUID claimUuid = UUID.randomUUID();
UUID buildingUuid = resident.boundWorkAreaUuid();
SettlementWorkOrder published = runtime.publish(SettlementWorkOrder.pendingTransport(
@@ -177,7 +177,7 @@ void harvestHandlerClaimsHaulResourceOrderForFloatingLaborResident() {
@Test
void harvestHandlerClaimsFetchInputOrderForFloatingLaborResident() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
- BannerModSettlementResidentRecord resident = sampleProjectedWorker();
+ SettlementResidentRecord resident = sampleProjectedWorker();
UUID claimUuid = UUID.randomUUID();
UUID buildingUuid = resident.boundWorkAreaUuid();
SettlementWorkOrder published = runtime.publish(SettlementWorkOrder.pendingTransport(
@@ -205,7 +205,7 @@ void harvestHandlerClaimsFetchInputOrderForFloatingLaborResident() {
@Test
void jobTaskDefinitionRejectsInvalidValues() {
ResourceLocation id = ResourceLocation.fromNamespaceAndPath("bannermod", "t");
- BannerModSettlementJobHandlerSeed seed = BannerModSettlementJobHandlerSeed.FLOATING_LABOR_POOL;
+ SettlementJobHandlerSeed seed = SettlementJobHandlerSeed.FLOATING_LABOR_POOL;
JobTaskDefinition ok = new JobTaskDefinition(id, seed, 0, 1, true, false);
assertNotNull(ok);
@@ -224,57 +224,57 @@ void jobTaskDefinitionRejectsInvalidValues() {
}
}
- private static BannerModSettlementResidentRecord sampleProjectedWorker() {
+ private static SettlementResidentRecord sampleProjectedWorker() {
UUID residentUuid = UUID.randomUUID();
UUID buildingUuid = UUID.randomUUID();
- return new BannerModSettlementResidentRecord(
+ return new SettlementResidentRecord(
residentUuid,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
- new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
+ new SettlementResidentServiceContract(
+ SettlementServiceActorState.LOCAL_BUILDING_SERVICE,
buildingUuid,
"bannermod:crop_area"
),
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.randomUUID(),
"team",
buildingUuid,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
);
}
- private static BannerModSettlementResidentRecord sampleSettlementResident() {
+ private static SettlementResidentRecord sampleSettlementResident() {
UUID residentUuid = UUID.randomUUID();
- return new BannerModSettlementResidentRecord(
+ return new SettlementResidentRecord(
residentUuid,
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentScheduleSeed.SETTLEMENT_IDLE,
- BannerModSettlementResidentRuntimeRoleSeed.VILLAGE_LIFE,
- BannerModSettlementResidentServiceContract.defaultFor(
- BannerModSettlementResidentRole.VILLAGER,
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE,
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentScheduleSeed.SETTLEMENT_IDLE,
+ SettlementResidentRuntimeRoleState.VILLAGE_LIFE,
+ SettlementResidentServiceContract.defaultFor(
+ SettlementResidentRole.VILLAGER,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentAssignmentState.NOT_APPLICABLE,
null,
null
),
- BannerModSettlementResidentMode.SETTLEMENT_RESIDENT,
+ SettlementResidentMode.SETTLEMENT_RESIDENT,
null,
null,
null,
- BannerModSettlementResidentAssignmentState.NOT_APPLICABLE
+ SettlementResidentAssignmentState.NOT_APPLICABLE
);
}
- private record TestJobHandler(ResourceLocation id, BannerModSettlementJobHandlerSeed seed) implements JobHandler {
+ private record TestJobHandler(ResourceLocation id, SettlementJobHandlerSeed seed) implements JobHandler {
@Override
public ResourceLocation id() {
return id;
}
@Override
- public BannerModSettlementJobHandlerSeed handles() {
+ public SettlementJobHandlerSeed handles() {
return seed;
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridgeTest.java b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridgeTest.java
index 42dce3e6..b7a52e4e 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridgeTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModBuildAreaProjectBridgeTest.java
@@ -17,7 +17,7 @@ class BannerModBuildAreaProjectBridgeTest {
@Test
void noopResolverRequeuesProjectAtFrontAndReturnsEmpty() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
BannerModBuildAreaProjectBridge bridge = new BannerModBuildAreaProjectBridge();
UUID claim = UUID.randomUUID();
@@ -40,7 +40,7 @@ void noopResolverRequeuesProjectAtFrontAndReturnsEmpty() {
@Test
void stubResolverWithLoadedTemplateProducesSearchingBuilderAssignment() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
BannerModBuildAreaProjectBridge bridge = new BannerModBuildAreaProjectBridge();
UUID claim = UUID.randomUUID();
UUID buildArea = UUID.randomUUID();
@@ -68,7 +68,7 @@ void stubResolverWithLoadedTemplateProducesSearchingBuilderAssignment() {
@Test
void stubResolverWithUnloadedTemplateProducesMaterialsPendingPhase() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
BannerModBuildAreaProjectBridge bridge = new BannerModBuildAreaProjectBridge();
UUID claim = UUID.randomUUID();
UUID buildArea = UUID.randomUUID();
@@ -113,7 +113,7 @@ void assignmentWithPhaseKeepsBindingAndRejectsMissingRequiredFields() {
@Test
void emptyQueueYieldsEmptyOptional() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
BannerModBuildAreaProjectBridge bridge = new BannerModBuildAreaProjectBridge();
UUID claim = UUID.randomUUID();
@@ -126,7 +126,7 @@ void emptyQueueYieldsEmptyOptional() {
@Test
void resolverExceptionRequeuesAndPropagates() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
BannerModBuildAreaProjectBridge bridge = new BannerModBuildAreaProjectBridge();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(25, 2);
@@ -146,7 +146,7 @@ void resolverExceptionRequeuesAndPropagates() {
@Test
void runtimeTickClaimFeedsQueueAndReturnsAssignmentWithResolver() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
UUID claim = UUID.randomUUID();
UUID buildArea = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(77, 4);
diff --git a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectPersistenceTest.java b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectPersistenceTest.java
index 925c0bf2..a56ee6c1 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectPersistenceTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectPersistenceTest.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.project;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
import com.talhanation.bannermod.settlement.growth.PendingProject;
import com.talhanation.bannermod.settlement.growth.ProjectBlocker;
import com.talhanation.bannermod.settlement.growth.ProjectKind;
@@ -25,7 +25,7 @@
* Locks the persistence contract for the project-queue subsystem of SETTLEMENT-004
* ("Reload does not lose active meaningful settlement work state"). Covers both leaf
* ({@link PendingProject#toTag} / {@link PendingProject#fromTag}) and aggregate
- * ({@link BannerModSettlementProjectScheduler#toTag} / {@link BannerModSettlementProjectScheduler#fromTag})
+ * ({@link SettlementProjectScheduler#toTag} / {@link SettlementProjectScheduler#fromTag})
* roundtrips, plus forward-compat fallbacks for every embedded enum and the
* per-claim queue cap regression guard.
*
@@ -53,8 +53,8 @@ void pendingProjectRoundTripPreservesAllFields() {
PROJECT_X,
ProjectKind.UPGRADE,
TARGET_BUILDING,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
420,
12_345L,
7,
@@ -76,8 +76,8 @@ void pendingProjectNewBuildingDropsTargetEvenAcrossRoundTrip() {
PROJECT_X,
ProjectKind.NEW_BUILDING,
TARGET_BUILDING, // ctor will null this out
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
500,
0L,
3,
@@ -100,8 +100,8 @@ void everyProjectKindRoundTripsExactly() {
UUID target = kind == ProjectKind.NEW_BUILDING ? null : TARGET_BUILDING;
PendingProject original = new PendingProject(
PROJECT_X, kind, target,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
100, 0L, 1, ProjectBlocker.NONE
);
PendingProject decoded = PendingProject.fromTag(original.toTag());
@@ -117,8 +117,8 @@ void unknownProjectKindFallsBackToNewBuilding() {
CompoundTag tag = new CompoundTag();
tag.putUUID("Id", PROJECT_X);
tag.putString("Kind", "KIND_FROM_THE_FUTURE");
- tag.putString("Category", BannerModSettlementBuildingCategory.GENERAL.name());
- tag.putString("Profile", BannerModSettlementBuildingProfileSeed.GENERAL.name());
+ tag.putString("Category", SettlementBuildingCategory.GENERAL.name());
+ tag.putString("Profile", SettlementBuildingProfileSeed.GENERAL.name());
tag.putInt("Priority", 1);
tag.putLong("ProposedAt", 0L);
tag.putInt("Cost", 1);
@@ -137,8 +137,8 @@ void everyProjectBlockerRoundTripsExactly() {
for (ProjectBlocker blocker : ProjectBlocker.values()) {
PendingProject original = new PendingProject(
PROJECT_X, ProjectKind.NEW_BUILDING, null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
1, 0L, 1, blocker
);
PendingProject decoded = PendingProject.fromTag(original.toTag());
@@ -152,8 +152,8 @@ void unknownProjectBlockerFallsBackToNone() {
CompoundTag tag = new CompoundTag();
tag.putUUID("Id", PROJECT_X);
tag.putString("Kind", ProjectKind.NEW_BUILDING.name());
- tag.putString("Category", BannerModSettlementBuildingCategory.GENERAL.name());
- tag.putString("Profile", BannerModSettlementBuildingProfileSeed.GENERAL.name());
+ tag.putString("Category", SettlementBuildingCategory.GENERAL.name());
+ tag.putString("Profile", SettlementBuildingProfileSeed.GENERAL.name());
tag.putInt("Priority", 1);
tag.putLong("ProposedAt", 0L);
tag.putInt("Cost", 1);
@@ -171,10 +171,10 @@ void unknownProjectBlockerFallsBackToNone() {
@Test
void emptySchedulerRoundTripsToEmptyScheduler() {
- BannerModSettlementProjectScheduler original = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler original = SettlementProjectScheduler.detached();
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(original.toTag());
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(original.toTag());
assertTrue(decoded.snapshot(CLAIM_A).isEmpty(),
"empty scheduler must roundtrip to empty — no spurious decoded entries");
@@ -187,7 +187,7 @@ void multiClaimRoundTripPreservesQueuesAndPriorityOrder() {
// Two claims, each with mixed-priority queues. Submission order is intentionally
// non-priority-sorted on the input side so the priority-sort contract is the
// observable check, not the insertion contract.
- BannerModSettlementProjectScheduler original = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler original = SettlementProjectScheduler.detached();
original.submit(CLAIM_A, ProjectTestFactory.general(100, 5));
original.submit(CLAIM_A, ProjectTestFactory.general(500, 3));
original.submit(CLAIM_A, ProjectTestFactory.general(300, 4));
@@ -198,8 +198,8 @@ void multiClaimRoundTripPreservesQueuesAndPriorityOrder() {
assertEquals(500, claimABefore.get(0).priorityScore(),
"highest priority must lead claimA after submit() priority sort — guards the test premise");
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(original.toTag());
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(original.toTag());
assertEquals(claimABefore, decoded.snapshot(CLAIM_A),
"claimA queue must roundtrip in priority-sorted order");
@@ -209,12 +209,12 @@ void multiClaimRoundTripPreservesQueuesAndPriorityOrder() {
@Test
void cancellationLogRoundTripsEntries() {
- BannerModSettlementProjectScheduler original = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler original = SettlementProjectScheduler.detached();
original.cancel(PROJECT_X, ProjectCancellationReason.SUPERSEDED);
original.cancel(PROJECT_Y, ProjectCancellationReason.BLOCKED);
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(original.toTag());
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(original.toTag());
assertEquals(ProjectCancellationReason.SUPERSEDED, decoded.lastCancellationReason(PROJECT_X),
"SUPERSEDED cancellation must survive the roundtrip");
@@ -227,11 +227,11 @@ void everyCancellationReasonRoundTripsExactly() {
// Defends against accidental enum churn on the cancellation side, mirroring the
// ProjectKind / ProjectBlocker checks above.
for (ProjectCancellationReason reason : ProjectCancellationReason.values()) {
- BannerModSettlementProjectScheduler original = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler original = SettlementProjectScheduler.detached();
original.cancel(PROJECT_X, reason);
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(original.toTag());
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(original.toTag());
assertEquals(reason, decoded.lastCancellationReason(PROJECT_X),
"ProjectCancellationReason." + reason.name() + " must roundtrip exactly");
@@ -251,8 +251,8 @@ void unknownCancellationReasonFallsBackToManual() {
cancellations.add(cancellationTag);
tag.put("Cancellations", cancellations);
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(tag);
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(tag);
assertEquals(ProjectCancellationReason.MANUAL, decoded.lastCancellationReason(PROJECT_X),
"unknown cancellation reason must fall back to MANUAL");
@@ -268,7 +268,7 @@ void roundTripEnforcesPerClaimQueueCap() {
CompoundTag queueTag = new CompoundTag();
queueTag.putUUID("Claim", CLAIM_A);
ListTag projectTags = new ListTag();
- int overshoot = BannerModSettlementProjectScheduler.PER_CLAIM_QUEUE_CAP + 5;
+ int overshoot = SettlementProjectScheduler.PER_CLAIM_QUEUE_CAP + 5;
for (int i = 0; i < overshoot; i++) {
// Build a unique-id project; reuse the toTag emission path so a regression in
// PendingProject.toTag would fail the cap test instead of silently passing.
@@ -276,8 +276,8 @@ void roundTripEnforcesPerClaimQueueCap() {
UUID.randomUUID(),
ProjectKind.NEW_BUILDING,
null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
100, i, 1, ProjectBlocker.NONE
);
projectTags.add(project.toTag());
@@ -287,10 +287,10 @@ void roundTripEnforcesPerClaimQueueCap() {
tag.put("Queues", queues);
tag.put("Cancellations", new ListTag());
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(tag);
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(tag);
- assertEquals(BannerModSettlementProjectScheduler.PER_CLAIM_QUEUE_CAP,
+ assertEquals(SettlementProjectScheduler.PER_CLAIM_QUEUE_CAP,
decoded.pendingCount(CLAIM_A),
"loader must truncate to PER_CLAIM_QUEUE_CAP, not lift the cap on load");
}
@@ -303,7 +303,7 @@ void roundTripEnforcesPerClaimQueueCap() {
void identicalRestoreFromTagDoesNotDirty() {
// Same content via NBT roundtrip must not mark dirty — that's the "no false dirty
// churn on identical reload/restore" half of the SETTLEMENT-004 acceptance.
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
scheduler.submit(CLAIM_A, ProjectTestFactory.general(200, 1));
scheduler.cancel(PROJECT_X, ProjectCancellationReason.MANUAL);
@@ -318,7 +318,7 @@ void identicalRestoreFromTagDoesNotDirty() {
@Test
void differentRestoreFromTagDoesDirty() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
scheduler.submit(CLAIM_A, ProjectTestFactory.general(200, 1));
AtomicInteger dirtyCount = new AtomicInteger();
@@ -339,11 +339,11 @@ void decodedSchedulerIsIndependentOfSource() {
// Defensive: a regression where fromTag returned a scheduler that shared internal
// collections with the source would silently bleed mutations across saved-data
// boundaries. PendingProject is a record so this is unlikely, but the test is cheap.
- BannerModSettlementProjectScheduler original = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler original = SettlementProjectScheduler.detached();
original.submit(CLAIM_A, ProjectTestFactory.general(100, 1));
- BannerModSettlementProjectScheduler decoded =
- BannerModSettlementProjectScheduler.fromTag(original.toTag());
+ SettlementProjectScheduler decoded =
+ SettlementProjectScheduler.fromTag(original.toTag());
decoded.pollNext(CLAIM_A);
@@ -361,7 +361,7 @@ void schedulerToTagSkipsEmptyQueues() {
// representation as a zero-entry queue tag — that would produce save bloat over
// long-running worlds and break the `if (queue.isEmpty()) queues.remove` invariant
// on the runtime side.
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
scheduler.submit(CLAIM_A, ProjectTestFactory.general(100, 1));
scheduler.pollNext(CLAIM_A);
diff --git a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntimeTest.java b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntimeTest.java
index a1b57bcc..0a25a93c 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntimeTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectRuntimeTest.java
@@ -13,11 +13,11 @@
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class BannerModSettlementProjectRuntimeTest {
+class SettlementProjectRuntimeTest {
@Test
void nullClaimUuidReturnsEmptyWithoutTouchingQueue() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
Optional<ProjectAssignment> assignment = runtime.tickClaim(
null,
@@ -32,14 +32,14 @@ void nullClaimUuidReturnsEmptyWithoutTouchingQueue() {
@Test
void buildAreaResolverFallsBackToNoopWhenLevelOrClaimManagerIsMissing() {
- BannerModBuildAreaProjectBridge.BuildAreaResolver resolver = BannerModSettlementProjectRuntime.buildAreaResolver(null);
+ BannerModBuildAreaProjectBridge.BuildAreaResolver resolver = SettlementProjectRuntime.buildAreaResolver(null);
assertInstanceOf(BannerModBuildAreaProjectBridge.NoopBuildAreaResolver.class, resolver);
}
@Test
void nullResolverAndNullGrowthQueueUseSafeFallbacks() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
UUID claim = UUID.randomUUID();
Optional<ProjectAssignment> assignment = runtime.tickClaim(null, claim, null, null, 20L);
@@ -50,7 +50,7 @@ void nullResolverAndNullGrowthQueueUseSafeFallbacks() {
@Test
void assignmentLookupHandlesNullAndUnknownBuildAreas() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
assertTrue(runtime.assignmentForBuildArea(null).isEmpty());
assertTrue(runtime.assignmentForBuildArea(UUID.randomUUID()).isEmpty());
@@ -58,7 +58,7 @@ void assignmentLookupHandlesNullAndUnknownBuildAreas() {
@Test
void buildAreaLifecycleTransitionsToStartedAndCompletedAndStaysCompleted() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
UUID claim = UUID.randomUUID();
UUID buildArea = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(55, 4);
@@ -81,7 +81,7 @@ void buildAreaLifecycleTransitionsToStartedAndCompletedAndStaysCompleted() {
@Test
void buildAreaLifecycleIgnoresUnknownOrNullBuildAreas() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
assertFalse(runtime.onBuildAreaStarted(null).isPresent());
assertFalse(runtime.onBuildAreaCompleted(UUID.randomUUID()).isPresent());
@@ -89,7 +89,7 @@ void buildAreaLifecycleIgnoresUnknownOrNullBuildAreas() {
@Test
void snapshotReturnsDefensiveCopyOfSchedulerState() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(80, 5);
@@ -103,7 +103,7 @@ void snapshotReturnsDefensiveCopyOfSchedulerState() {
@Test
void queuedProjectSurvivesNoopTickAndDedupesOnRetryAssignment() {
- BannerModSettlementProjectRuntime runtime = BannerModSettlementProjectRuntime.detached();
+ SettlementProjectRuntime runtime = SettlementProjectRuntime.detached();
UUID claim = UUID.randomUUID();
UUID buildArea = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(65, 4);
@@ -138,11 +138,11 @@ void queuedProjectSurvivesNoopTickAndDedupesOnRetryAssignment() {
@Test
void staticConvenienceMethodsIgnoreNullInputs() {
- assertTrue(BannerModSettlementProjectRuntime.tickClaim(null, UUID.randomUUID(), List.of(ProjectTestFactory.general(20, 2))).isEmpty());
+ assertTrue(SettlementProjectRuntime.tickClaim(null, UUID.randomUUID(), List.of(ProjectTestFactory.general(20, 2))).isEmpty());
- BannerModSettlementProjectRuntime.onBuildAreaStarted(null, UUID.randomUUID());
- BannerModSettlementProjectRuntime.onBuildAreaStarted(null, null);
- BannerModSettlementProjectRuntime.onBuildAreaCompleted(null, UUID.randomUUID());
- BannerModSettlementProjectRuntime.onBuildAreaCompleted(null, null);
+ SettlementProjectRuntime.onBuildAreaStarted(null, UUID.randomUUID());
+ SettlementProjectRuntime.onBuildAreaStarted(null, null);
+ SettlementProjectRuntime.onBuildAreaCompleted(null, UUID.randomUUID());
+ SettlementProjectRuntime.onBuildAreaCompleted(null, null);
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSchedulerTest.java b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSchedulerTest.java
index 94dc970e..b5c7f912 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSchedulerTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/project/BannerModSettlementProjectSchedulerTest.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.project;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
import com.talhanation.bannermod.settlement.growth.PendingProject;
import com.talhanation.bannermod.settlement.growth.ProjectBlocker;
import com.talhanation.bannermod.settlement.growth.ProjectKind;
@@ -19,11 +19,11 @@
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class BannerModSettlementProjectSchedulerTest {
+class SettlementProjectSchedulerTest {
@Test
void submitThenPollRoundTripsPreservesProject() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(100, 10);
@@ -43,9 +43,9 @@ void submitThenPollRoundTripsPreservesProject() {
@Test
void overflowBeyondCapKeepsHighestPriorityProjects() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
- int over = BannerModSettlementProjectScheduler.PER_CLAIM_QUEUE_CAP + 5;
+ int over = SettlementProjectScheduler.PER_CLAIM_QUEUE_CAP + 5;
PendingProject[] submitted = new PendingProject[over];
for (int i = 0; i < over; i++) {
@@ -53,7 +53,7 @@ void overflowBeyondCapKeepsHighestPriorityProjects() {
scheduler.submit(claim, submitted[i]);
}
- assertEquals(BannerModSettlementProjectScheduler.PER_CLAIM_QUEUE_CAP,
+ assertEquals(SettlementProjectScheduler.PER_CLAIM_QUEUE_CAP,
scheduler.pendingCount(claim),
"queue must clamp to per-claim cap");
@@ -66,7 +66,7 @@ void overflowBeyondCapKeepsHighestPriorityProjects() {
@Test
void higherPrioritySubmitMovesAheadOfExistingQueue() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
PendingProject low = ProjectTestFactory.general(10, 5);
PendingProject high = ProjectTestFactory.general(90, 5);
@@ -80,7 +80,7 @@ void higherPrioritySubmitMovesAheadOfExistingQueue() {
@Test
void cancelByProjectIdRemovesFromQueue() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
PendingProject head = ProjectTestFactory.general(50, 5);
PendingProject mid = ProjectTestFactory.general(40, 5);
@@ -102,7 +102,7 @@ void cancelByProjectIdRemovesFromQueue() {
@Test
void perClaimQueuesStayIsolated() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claimX = UUID.randomUUID();
UUID claimY = UUID.randomUUID();
@@ -124,7 +124,7 @@ void perClaimQueuesStayIsolated() {
@Test
void snapshotReturnsStableDefensiveCopy() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
PendingProject first = ProjectTestFactory.general(10, 5);
PendingProject second = ProjectTestFactory.general(20, 5);
@@ -150,15 +150,15 @@ void snapshotReturnsStableDefensiveCopy() {
@Test
void duplicateSubmitsAreDroppedByProjectId() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
UUID projectId = UUID.randomUUID();
PendingProject project = new PendingProject(
projectId,
ProjectKind.NEW_BUILDING,
null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
100,
0L,
5,
@@ -172,7 +172,7 @@ void duplicateSubmitsAreDroppedByProjectId() {
@Test
void resetDropsEverything() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
scheduler.submit(claim, ProjectTestFactory.general(10, 5));
scheduler.cancel(UUID.randomUUID(), ProjectCancellationReason.MANUAL);
@@ -185,7 +185,7 @@ void resetDropsEverything() {
@Test
void pollingLastProjectRemovesNonPersistedEmptyQueue() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
AtomicInteger dirtyCount = new AtomicInteger();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(50, 5);
@@ -202,7 +202,7 @@ void pollingLastProjectRemovesNonPersistedEmptyQueue() {
@Test
void restoreFromTagMarksDirtyOnlyWhenPersistedSchedulerStateChanges() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
AtomicInteger dirtyCount = new AtomicInteger();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(50, 5);
@@ -212,7 +212,7 @@ void restoreFromTagMarksDirtyOnlyWhenPersistedSchedulerStateChanges() {
scheduler.restoreFromTag(new CompoundTag());
assertEquals(0, dirtyCount.get());
- BannerModSettlementProjectScheduler source = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler source = SettlementProjectScheduler.detached();
source.submit(claim, project);
CompoundTag tag = source.toTag();
@@ -225,7 +225,7 @@ void restoreFromTagMarksDirtyOnlyWhenPersistedSchedulerStateChanges() {
@Test
void duplicateUnknownCancellationDoesNotDirtyAgain() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
AtomicInteger dirtyCount = new AtomicInteger();
UUID projectId = UUID.randomUUID();
@@ -239,15 +239,15 @@ void duplicateUnknownCancellationDoesNotDirtyAgain() {
@Test
void nbtRoundTripRestoresQueuesAndCancellations() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
UUID claim = UUID.randomUUID();
UUID target = UUID.randomUUID();
PendingProject project = new PendingProject(
UUID.randomUUID(),
ProjectKind.REPAIR,
target,
- BannerModSettlementBuildingCategory.STORAGE,
- BannerModSettlementBuildingProfileSeed.STORAGE,
+ SettlementBuildingCategory.STORAGE,
+ SettlementBuildingProfileSeed.STORAGE,
1200,
44L,
9,
@@ -258,15 +258,15 @@ void nbtRoundTripRestoresQueuesAndCancellations() {
scheduler.submit(claim, project);
scheduler.cancel(cancelled, ProjectCancellationReason.BLOCKED);
- BannerModSettlementProjectScheduler restored = BannerModSettlementProjectScheduler.fromTag(scheduler.toTag());
+ SettlementProjectScheduler restored = SettlementProjectScheduler.fromTag(scheduler.toTag());
assertEquals(1, restored.pendingCount(claim));
PendingProject restoredProject = restored.peek(claim).orElseThrow();
assertEquals(project.projectId(), restoredProject.projectId());
assertEquals(ProjectKind.REPAIR, restoredProject.kind());
assertEquals(target, restoredProject.targetBuildingUuid());
- assertEquals(BannerModSettlementBuildingCategory.STORAGE, restoredProject.buildingCategory());
- assertEquals(BannerModSettlementBuildingProfileSeed.STORAGE, restoredProject.profileSeed());
+ assertEquals(SettlementBuildingCategory.STORAGE, restoredProject.buildingCategory());
+ assertEquals(SettlementBuildingProfileSeed.STORAGE, restoredProject.profileSeed());
assertEquals(1000, restoredProject.priorityScore());
assertEquals(44L, restoredProject.proposedAtGameTime());
assertEquals(9, restoredProject.estimatedTickCost());
@@ -276,13 +276,13 @@ void nbtRoundTripRestoresQueuesAndCancellations() {
@Test
void savedDataRoundTripRestoresRuntimeQueue() {
- BannerModSettlementProjectSavedData source = new BannerModSettlementProjectSavedData();
+ SettlementProjectSavedData source = new SettlementProjectSavedData();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(75, 6);
source.runtime().scheduler().submit(claim, project);
- BannerModSettlementProjectSavedData restored = BannerModSettlementProjectSavedData.load(source.save(new CompoundTag(), null), null);
+ SettlementProjectSavedData restored = SettlementProjectSavedData.load(source.save(new CompoundTag(), null), null);
assertEquals(1, restored.runtime().scheduler().pendingCount(claim));
assertEquals(project.projectId(), restored.runtime().scheduler().peek(claim).orElseThrow().projectId());
@@ -290,7 +290,7 @@ void savedDataRoundTripRestoresRuntimeQueue() {
@Test
void dirtyListenerRunsOnlyForEffectiveMutations() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
AtomicInteger dirtyCount = new AtomicInteger();
UUID claim = UUID.randomUUID();
PendingProject project = ProjectTestFactory.general(50, 5);
@@ -308,12 +308,12 @@ void dirtyListenerRunsOnlyForEffectiveMutations() {
@Test
void forServerRejectsNullLevel() {
- assertThrows(IllegalArgumentException.class, () -> BannerModSettlementProjectScheduler.forServer(null));
+ assertThrows(IllegalArgumentException.class, () -> SettlementProjectScheduler.forServer(null));
}
@Test
void requeueFrontPrependsProjectAndMarksDirty() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
AtomicInteger dirtyCount = new AtomicInteger();
UUID claim = UUID.randomUUID();
PendingProject queued = ProjectTestFactory.general(50, 5);
@@ -331,10 +331,10 @@ void requeueFrontPrependsProjectAndMarksDirty() {
@Test
void requeueFrontRespectsCapAndLeavesQueueUntouchedWhenFull() {
- BannerModSettlementProjectScheduler scheduler = BannerModSettlementProjectScheduler.detached();
+ SettlementProjectScheduler scheduler = SettlementProjectScheduler.detached();
AtomicInteger dirtyCount = new AtomicInteger();
UUID claim = UUID.randomUUID();
- for (int i = 0; i < BannerModSettlementProjectScheduler.PER_CLAIM_QUEUE_CAP; i++) {
+ for (int i = 0; i < SettlementProjectScheduler.PER_CLAIM_QUEUE_CAP; i++) {
scheduler.submit(claim, ProjectTestFactory.general(200 - i, 1));
}
List<PendingProject> before = scheduler.snapshot(claim);
diff --git a/src/test/java/com/talhanation/bannermod/settlement/project/ProjectTestFactory.java b/src/test/java/com/talhanation/bannermod/settlement/project/ProjectTestFactory.java
index 6e702ddc..90419142 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/project/ProjectTestFactory.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/project/ProjectTestFactory.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.settlement.project;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingCategory;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingProfileSeed;
+import com.talhanation.bannermod.settlement.SettlementBuildingCategory;
+import com.talhanation.bannermod.settlement.SettlementBuildingProfileSeed;
import com.talhanation.bannermod.settlement.growth.PendingProject;
import com.talhanation.bannermod.settlement.growth.ProjectBlocker;
import com.talhanation.bannermod.settlement.growth.ProjectKind;
@@ -22,8 +22,8 @@ static PendingProject general(int priority, int tickCost) {
UUID.randomUUID(),
ProjectKind.NEW_BUILDING,
null,
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
priority,
0L,
tickCost,
@@ -36,8 +36,8 @@ static PendingProject withKind(ProjectKind kind, int priority) {
UUID.randomUUID(),
kind,
kind == ProjectKind.NEW_BUILDING ? null : UUID.randomUUID(),
- BannerModSettlementBuildingCategory.GENERAL,
- BannerModSettlementBuildingProfileSeed.GENERAL,
+ SettlementBuildingCategory.GENERAL,
+ SettlementBuildingProfileSeed.GENERAL,
priority,
0L,
5,
diff --git a/src/test/java/com/talhanation/bannermod/settlement/runtime/SettlementSeaTradeAnalyzerTest.java b/src/test/java/com/talhanation/bannermod/settlement/runtime/SettlementSeaTradeAnalyzerTest.java
new file mode 100644
index 00000000..0976c633
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/runtime/SettlementSeaTradeAnalyzerTest.java
@@ -0,0 +1,142 @@
+package com.talhanation.bannermod.settlement.runtime;
+
+import com.talhanation.bannermod.settlement.SettlementDesiredGoodSnapshot;
+import com.talhanation.bannermod.shared.logistics.BannerModLogisticsItemFilter;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeExecutionRecord;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeExecutionState;
+import com.talhanation.bannermod.shared.logistics.BannerModSeaTradeSummary;
+import net.minecraft.resources.ResourceLocation;
+import org.junit.jupiter.api.Test;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class SettlementSeaTradeAnalyzerTest {
+ @Test
+ void statusLinesExposeExecutionProgressAndFailures() {
+ UUID sourceId = UUID.fromString("00000000-0000-0000-0000-000000003101");
+ UUID destinationId = UUID.fromString("00000000-0000-0000-0000-000000003102");
+ BannerModLogisticsItemFilter wheat = BannerModLogisticsItemFilter.ofItemIds(List.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat")));
+
+ List<String> lines = SettlementSeaTradeAnalyzer.statusLines(
+ BannerModSeaTradeSummary.summarise(List.of()),
+ List.of(
+ seaTradeRecord("00000000-0000-0000-0000-000000003201", sourceId, destinationId, wheat, 16, 0, BannerModSeaTradeExecutionState.LOADING, ""),
+ seaTradeRecord("00000000-0000-0000-0000-000000003202", sourceId, destinationId, wheat, 16, 8, BannerModSeaTradeExecutionState.TRAVELLING, ""),
+ seaTradeRecord("00000000-0000-0000-0000-000000003203", sourceId, destinationId, wheat, 16, 8, BannerModSeaTradeExecutionState.UNLOADING, ""),
+ seaTradeRecord("00000000-0000-0000-0000-000000003204", sourceId, destinationId, wheat, 16, 0, BannerModSeaTradeExecutionState.COMPLETE, ""),
+ seaTradeRecord("00000000-0000-0000-0000-000000003205", sourceId, destinationId, wheat, 16, 0, BannerModSeaTradeExecutionState.FAILED, BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER),
+ seaTradeRecord("00000000-0000-0000-0000-000000003206", sourceId, destinationId, wheat, 16, 4, BannerModSeaTradeExecutionState.FAILED, BannerModSeaTradeExecutionRecord.FAILURE_DESTINATION_FULL)
+ )
+ );
+
+ assertEquals(List.of(
+ "gui.bannermod.governor.logistics.sea_trade.loading 3201 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 0 16",
+ "gui.bannermod.governor.logistics.sea_trade.travelling 3202 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 8 16",
+ "gui.bannermod.governor.logistics.sea_trade.unloading 3203 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 8 16",
+ "gui.bannermod.governor.logistics.sea_trade.completed 3204 2201 gui.bannermod.governor.logistics.sea_trade.reason.none minecraft:wheat 0 16",
+ "gui.bannermod.governor.logistics.sea_trade.missing_ship 3205 unassigned gui.bannermod.governor.logistics.sea_trade.reason.no_carrier minecraft:wheat 0 16",
+ "gui.bannermod.governor.logistics.sea_trade.blocked_cargo 3206 2201 gui.bannermod.governor.logistics.sea_trade.reason.destination_full minecraft:wheat 4 16"
+ ), lines.subList(0, 6));
+ }
+
+ @Test
+ void statusLocalizationCoversSuccessfulAndBlockedRoutes() throws Exception {
+ String enUs = Files.readString(Path.of("src/main/resources/assets/bannermod/lang/en_us.json"));
+ String ruRu = Files.readString(Path.of("src/main/resources/assets/bannermod/lang/ru_ru.json"));
+
+ for (String lang : List.of(enUs, ruRu)) {
+ assertTrue(lang.contains("gui.bannermod.governor.logistics.sea_trade.completed"));
+ assertTrue(lang.contains("gui.bannermod.governor.logistics.sea_trade.blocked_cargo"));
+ assertTrue(lang.contains("gui.bannermod.governor.logistics.sea_trade.reason.destination_full"));
+ }
+ }
+
+ @Test
+ void desiredGoodsIncludeSeaTradeImportAndExportDrivers() {
+ BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 4),
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 2),
+ List.of()
+ );
+
+ assertEquals(List.of(
+ new SettlementDesiredGoodSnapshot("sea_import:minecraft:iron_ingot", 2),
+ new SettlementDesiredGoodSnapshot("sea_export:minecraft:wheat", 4)
+ ), SettlementSeaTradeAnalyzer.desiredGoods(seaTradeSummary));
+ }
+
+ @Test
+ void coverageCountsSeaTradeImportAndExportCapacity() {
+ BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 5),
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 4),
+ List.of()
+ );
+
+ assertEquals(4, SettlementSeaTradeAnalyzer.addCoverageUnits("sea_import:minecraft:iron_ingot", 0, seaTradeSummary));
+ assertEquals(5, SettlementSeaTradeAnalyzer.addCoverageUnits("sea_export:minecraft:wheat", 0, seaTradeSummary));
+ assertEquals(2, SettlementSeaTradeAnalyzer.addCoverageUnits("market_goods", 2, seaTradeSummary));
+ }
+
+ @Test
+ void statusLinesIncludeBenefitsBottlenecksAndFallbackLabels() {
+ BannerModSeaTradeSummary.Summary seaTradeSummary = new BannerModSeaTradeSummary.Summary(
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "wheat"), 5),
+ Map.of(ResourceLocation.fromNamespaceAndPath("minecraft", "iron_ingot"), 3),
+ List.of(BannerModSeaTradeSummary.BOTTLENECK_ONLY_EXPORTS, BannerModSeaTradeSummary.BOTTLENECK_UNFILTERED_ROUTE)
+ );
+
+ List<String> lines = SettlementSeaTradeAnalyzer.statusLines(
+ seaTradeSummary,
+ List.of(seaTradeRecord(
+ "00000000-0000-0000-0000-000000003207",
+ UUID.fromString("00000000-0000-0000-0000-000000003101"),
+ UUID.fromString("00000000-0000-0000-0000-000000003102"),
+ BannerModLogisticsItemFilter.any(),
+ 6,
+ 1,
+ BannerModSeaTradeExecutionState.FAILED,
+ "unexpected_failure"
+ ))
+ );
+
+ assertEquals(
+ "gui.bannermod.governor.logistics.sea_trade.blocked_cargo 3207 2201 gui.bannermod.governor.logistics.sea_trade.reason.carrier_failed any 1 6",
+ lines.get(0)
+ );
+ assertTrue(lines.contains("Sea import benefit: minecraft:iron_ingot x3"));
+ assertTrue(lines.contains("Sea export benefit: minecraft:wheat x5"));
+ assertTrue(lines.contains("Sea trade bottleneck: only_exports"));
+ assertTrue(lines.contains("Sea trade bottleneck: unfiltered_route"));
+ }
+
+ private static BannerModSeaTradeExecutionRecord seaTradeRecord(String routeId,
+ UUID sourceId,
+ UUID destinationId,
+ BannerModLogisticsItemFilter filter,
+ int requestedCount,
+ int cargoCount,
+ BannerModSeaTradeExecutionState state,
+ String failureReason) {
+ return new BannerModSeaTradeExecutionRecord(
+ UUID.fromString(routeId),
+ BannerModSeaTradeExecutionRecord.FAILURE_NO_CARRIER.equals(failureReason)
+ ? null
+ : UUID.fromString("00000000-0000-0000-0000-000000002201"),
+ sourceId,
+ destinationId,
+ filter,
+ requestedCount,
+ cargoCount,
+ state,
+ failureReason
+ );
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcherTest.java b/src/test/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcherTest.java
index 94f7c3ec..8a898d3c 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcherTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/validation/types/BuildingTypeValidatorDispatcherTest.java
@@ -40,7 +40,7 @@ void returnsRegisteredValidatorForEveryBuildingType() {
@Test
void fallsBackForUnregisteredBuildingType() {
- BuildingTypeValidatorDispatcher dispatcher = new BuildingTypeValidatorDispatcher();
+ BuildingTypeValidatorDispatcher dispatcher = new BuildingTypeValidatorDispatcher(Map.of());
AtomicBoolean fallbackUsed = new AtomicBoolean(false);
BuildingValidationResult fallbackResult = BuildingValidationResult.blockingFailure(
BuildingType.FARM,
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/AnimalFarmerSettlementOrderParityTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/AnimalFarmerSettlementOrderParityTest.java
new file mode 100644
index 00000000..1a3e9528
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/AnimalFarmerSettlementOrderParityTest.java
@@ -0,0 +1,125 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import com.talhanation.bannermod.ai.civilian.AnimalFarmerLoopProgress;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import net.minecraft.core.BlockPos;
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class AnimalFarmerSettlementOrderParityTest {
+
+ private static final UUID CLAIM = UUID.fromString("00000000-0000-0000-0000-0000000008f1");
+ private static final UUID BUILDING = UUID.fromString("00000000-0000-0000-0000-0000000008b1");
+ private static final UUID RESIDENT = UUID.fromString("00000000-0000-0000-0000-0000000008a1");
+
+ @Test
+ void settlementOrdersMatchLegacyAnimalFarmerActionOutput() {
+ List<AnimalFarmerLoopProgress.Action> legacyOutput = legacyAnimalOutput();
+ SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.ANIMAL_SLAUGHTER, new BlockPos(1, 64, 3), null, 70, 12L));
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.ANIMAL_SPECIAL_TASK, new BlockPos(1, 64, 2), null, 80, 11L));
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.ANIMAL_BREED, new BlockPos(1, 64, 1), null, 90, 10L));
+
+ SettlementWorkOrder breed = runtime.claim(CLAIM, RESIDENT, null, 100L, 200L).orElseThrow();
+ runtime.complete(breed.orderUuid(), 101L);
+ SettlementWorkOrder specialTask = runtime.claim(CLAIM, RESIDENT, null, 102L, 200L).orElseThrow();
+ runtime.complete(specialTask.orderUuid(), 103L);
+ SettlementWorkOrder slaughter = runtime.claim(CLAIM, RESIDENT, null, 104L, 200L).orElseThrow();
+ runtime.complete(slaughter.orderUuid(), 105L);
+
+ assertEquals(legacyOutput, List.of(
+ toLegacyAction(breed.type()),
+ toLegacyAction(specialTask.type()),
+ toLegacyAction(slaughter.type())
+ ));
+ assertTrue(runtime.currentClaim(RESIDENT).isEmpty());
+ }
+
+ @Test
+ void finishedAnimalLoopEmitsNoSettlementOrder() {
+ AnimalFarmerLoopProgress.Decision finished = AnimalFarmerLoopProgress.selectNextAction(
+ false, false, 0,
+ false, 0, false,
+ false, 0, 12);
+ SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
+
+ assertTrue(finished.isFinished());
+ assertTrue(runtime.claim(CLAIM, RESIDENT, null, 100L, 200L).isEmpty());
+ }
+
+ @Test
+ void defaultPublisherRegistryCoversAnimalPenBuildings() {
+ SettlementBuildingRecord animalPen = new SettlementBuildingRecord(
+ BUILDING, "bannermod:animal_pen_area", BlockPos.ZERO, null, null, 0, 1, 0, List.of());
+
+ SettlementWorkOrderPublisher publisher = SettlementWorkOrderPublisherRegistry.defaults().publishers().stream()
+ .filter(candidate -> candidate.matches(animalPen))
+ .findFirst()
+ .orElseThrow();
+
+ assertInstanceOf(com.talhanation.bannermod.settlement.workorder.publisher.AnimalPenWorkOrderPublisher.class, publisher);
+ }
+
+ @Test
+ void settlementOrderWorkGoalExecutesAnimalHusbandryTypes() throws IOException {
+ String goal = Files.readString(Path.of("src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java"));
+
+ assertTrue(goal.contains("case ANIMAL_BREED -> executeAnimalBreed"));
+ assertTrue(goal.contains("case ANIMAL_SPECIAL_TASK -> executeAnimalSpecialTask"));
+ assertTrue(goal.contains("case ANIMAL_SLAUGHTER -> executeAnimalSlaughter"));
+ assertTrue(goal.contains("ANIMAL_BREED,"));
+ assertTrue(goal.contains("ANIMAL_SPECIAL_TASK,"));
+ assertTrue(goal.contains("ANIMAL_SLAUGHTER,"));
+ }
+
+ @Test
+ void animalFarmerUsesInheritedSettlementOrderGoalOnly() throws IOException {
+ Path legacyGoal = Path.of("src/main/java/com/talhanation/bannermod/ai/civilian/AnimalFarmerWorkGoal.java");
+ String animalFarmer = Files.readString(Path.of("src/main/java/com/talhanation/bannermod/entity/civilian/AnimalFarmerEntity.java"));
+ String abstractWorker = Files.readString(Path.of("src/main/java/com/talhanation/bannermod/entity/civilian/AbstractWorkerEntity.java"));
+
+ assertFalse(Files.exists(legacyGoal));
+ assertFalse(animalFarmer.contains("AnimalFarmerWorkGoal"));
+ assertFalse(animalFarmer.contains("protected void registerGoals()"));
+ assertTrue(abstractWorker.contains("new SettlementOrderWorkGoal(this)"));
+ }
+
+ private static List<AnimalFarmerLoopProgress.Action> legacyAnimalOutput() {
+ AnimalFarmerLoopProgress.Decision first = AnimalFarmerLoopProgress.selectNextAction(true, true, 4,
+ true, 2, false,
+ true, 14, 12);
+ AnimalFarmerLoopProgress.Decision second = AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
+ true, 2, false,
+ true, 14, 12);
+ AnimalFarmerLoopProgress.Decision third = AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
+ false, 0, false,
+ true, 14, 12);
+ AnimalFarmerLoopProgress.Decision finished = AnimalFarmerLoopProgress.selectNextAction(false, false, 0,
+ false, 0, false,
+ false, 0, 12);
+ assertTrue(finished.isFinished());
+ return List.of(first.action(), second.action(), third.action());
+ }
+
+ private static AnimalFarmerLoopProgress.Action toLegacyAction(SettlementWorkOrderType type) {
+ return switch (type) {
+ case ANIMAL_BREED -> AnimalFarmerLoopProgress.Action.PREPARE_BREED;
+ case ANIMAL_SPECIAL_TASK -> AnimalFarmerLoopProgress.Action.PREPARE_SPECIAL_TASK;
+ case ANIMAL_SLAUGHTER -> AnimalFarmerLoopProgress.Action.PREPARE_SLAUGHTER;
+ default -> throw new IllegalArgumentException("Unexpected animal-farmer order type: " + type);
+ };
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/BuilderWorkGoalMigrationContractTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/BuilderWorkGoalMigrationContractTest.java
new file mode 100644
index 00000000..ce0ff70d
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/BuilderWorkGoalMigrationContractTest.java
@@ -0,0 +1,88 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Source-level migration contract for WORKGOAL-004.
+ *
+ * <p>For a fixed build-order scenario where the target is air and the builder carries the
+ * blueprint item, the legacy BuilderWorkGoal output was: choose the matching item, place the
+ * requested block, play the placement sound, swing, shrink the item stack, and remove the build
+ * target. SettlementOrderWorkGoal must own that same observable mutation path.</p>
+ */
+class BuilderWorkGoalMigrationContractTest {
+ private static final Path ROOT = Path.of("");
+
+ private static final String BUILDER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/BuilderEntity.java";
+ private static final String ABSTRACT_WORKER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/AbstractWorkerEntity.java";
+ private static final String LEGACY_BUILDER_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/BuilderWorkGoal.java";
+ private static final String SETTLEMENT_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java";
+ private static final String BUILD_PUBLISHER =
+ "src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/BuildAreaWorkOrderPublisher.java";
+
+ @Test
+ void builderRegistersSettlementOrderWorkGoalOnly() throws IOException {
+ String builder = read(BUILDER_ENTITY);
+ String worker = read(ABSTRACT_WORKER_ENTITY);
+
+ assertFalse(Files.exists(ROOT.resolve(LEGACY_BUILDER_GOAL)),
+ "BuilderWorkGoal must be deleted from src/main");
+ assertTrue(worker.contains("new SettlementOrderWorkGoal(this)"),
+ "AbstractWorkerEntity must execute settlement work orders for builders through super.registerGoals()");
+ assertFalse(builder.contains("BuilderWorkGoal"),
+ "BuilderEntity must not reference the legacy builder goal");
+ assertFalse(builder.contains("new SettlementOrderWorkGoal(this)"),
+ "BuilderEntity must not register a duplicate settlement-order goal");
+ }
+
+ @Test
+ void buildAreaOrdersFeedTheGenericBuildBlockOutputPath() throws IOException {
+ String publisher = read(BUILD_PUBLISHER);
+ String goal = read(SETTLEMENT_GOAL);
+
+ assertTrue(publisher.contains("for (BuildBlock placement : buildArea.stackToPlace)"),
+ "publisher must emit one order per fixed build target");
+ assertTrue(publisher.contains("SettlementWorkOrderType.BUILD_BLOCK"),
+ "publisher must label fixed build targets as BUILD_BLOCK orders");
+
+ int buildCase = goal.indexOf("BUILD_BLOCK");
+ int matchingItem = goal.indexOf("worker.getMatchingItem", buildCase);
+ int setBlock = goal.indexOf("level.setBlockAndUpdate(target, buildingState)", matchingItem);
+ int playSound = goal.indexOf("level.playSound", setBlock);
+ int swing = goal.indexOf("worker.swing(InteractionHand.MAIN_HAND)", playSound);
+ int shrink = goal.indexOf("buildingItem.shrink(1)", swing);
+ int remove = goal.indexOf("buildArea.removeBuildBlockToPlace(target)", shrink);
+ int complete = goal.indexOf("completeActiveOrder(runtime, level)", remove);
+
+ assertTrue(buildCase >= 0, "SettlementOrderWorkGoal must handle BUILD_BLOCK orders");
+ assertTrue(matchingItem > buildCase,
+ "fixed build target must select the matching blueprint item, matching BuilderWorkGoal output");
+ assertTrue(setBlock > matchingItem,
+ "fixed air build target must place the requested block, matching BuilderWorkGoal output");
+ assertTrue(playSound > setBlock,
+ "fixed build target must play the placement sound after placement");
+ assertTrue(swing > playSound,
+ "fixed build target must swing after the placement sound");
+ assertTrue(shrink > swing,
+ "fixed build target must consume one carried item after swinging");
+ assertTrue(remove > shrink,
+ "fixed build target must clear the build-area placement entry after consuming the item");
+ assertTrue(complete > remove,
+ "fixed build target must complete the settlement work order after legacy-equivalent output");
+ }
+
+ private String read(String relativePath) throws IOException {
+ return Files.readString(ROOT.resolve(relativePath));
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/FarmerSettlementOrderParityTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/FarmerSettlementOrderParityTest.java
new file mode 100644
index 00000000..30d5b200
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/FarmerSettlementOrderParityTest.java
@@ -0,0 +1,69 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import com.talhanation.bannermod.ai.civilian.FarmerLoopProgress;
+import net.minecraft.core.BlockPos;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+class FarmerSettlementOrderParityTest {
+
+ private static final UUID CLAIM = UUID.fromString("00000000-0000-0000-0000-0000000002f1");
+ private static final UUID BUILDING = UUID.fromString("00000000-0000-0000-0000-0000000002b1");
+ private static final UUID RESIDENT = UUID.fromString("00000000-0000-0000-0000-0000000002a1");
+
+ @Test
+ void settlementOrdersMatchLegacyFarmerCropActionOutput() {
+ List<FarmerLoopProgress.Action> legacyOutput = legacyCropOutput(true, true, true);
+ SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.PLANT_CROP, new BlockPos(1, 64, 1), null, 50, 10L));
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.TILL_SOIL, new BlockPos(1, 64, 2), null, 60, 11L));
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.HARVEST_CROP, new BlockPos(1, 64, 3), null, 80, 12L));
+
+ SettlementWorkOrder harvest = runtime.claim(CLAIM, RESIDENT, null, 100L, 200L).orElseThrow();
+ runtime.complete(harvest.orderUuid(), 101L);
+ SettlementWorkOrder till = runtime.claim(CLAIM, RESIDENT, null, 102L, 200L).orElseThrow();
+ runtime.complete(till.orderUuid(), 103L);
+ SettlementWorkOrder plant = runtime.claim(CLAIM, RESIDENT, null, 104L, 200L).orElseThrow();
+ runtime.complete(plant.orderUuid(), 105L);
+
+ assertEquals(legacyOutput, List.of(
+ FarmerLoopProgress.Action.PREPARE_BREAK_BLOCKS,
+ FarmerLoopProgress.Action.PREPARE_PLOWING,
+ FarmerLoopProgress.Action.PREPARE_PLANT_SEEDS
+ ));
+ assertEquals(legacyOutput, List.of(
+ toLegacyAction(harvest.type()),
+ toLegacyAction(till.type()),
+ toLegacyAction(plant.type())
+ ));
+ assertTrue(runtime.currentClaim(RESIDENT).isEmpty());
+ }
+
+ private static List<FarmerLoopProgress.Action> legacyCropOutput(boolean hasBlocksToBreak,
+ boolean hasBlocksToPlow,
+ boolean hasBlocksToPlant) {
+ FarmerLoopProgress.Decision first = FarmerLoopProgress.selectNextAction(hasBlocksToBreak, hasBlocksToPlow, hasBlocksToPlant);
+ FarmerLoopProgress.Decision second = FarmerLoopProgress.selectNextAction(false, hasBlocksToPlow, hasBlocksToPlant);
+ FarmerLoopProgress.Decision third = FarmerLoopProgress.selectNextAction(false, false, hasBlocksToPlant);
+ FarmerLoopProgress.Decision finished = FarmerLoopProgress.selectNextAction(false, false, false);
+ assertTrue(finished.isFinished());
+ return List.of(first.action(), second.action(), third.action());
+ }
+
+ private static FarmerLoopProgress.Action toLegacyAction(SettlementWorkOrderType type) {
+ return switch (type) {
+ case HARVEST_CROP -> FarmerLoopProgress.Action.PREPARE_BREAK_BLOCKS;
+ case TILL_SOIL -> FarmerLoopProgress.Action.PREPARE_PLOWING;
+ case PLANT_CROP -> FarmerLoopProgress.Action.PREPARE_PLANT_SEEDS;
+ default -> throw new IllegalArgumentException("Unexpected farmer order type: " + type);
+ };
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/FishermanWorkGoalMigrationContractTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/FishermanWorkGoalMigrationContractTest.java
new file mode 100644
index 00000000..d7d1da91
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/FishermanWorkGoalMigrationContractTest.java
@@ -0,0 +1,107 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Source-level migration contract for WORKGOAL-007.
+ *
+ * <p>For a fixed fishing target where the fisherman has a rod and inventory space, the legacy
+ * FishermanWorkGoal output was: switch to a rod, swing/throw, spawn a bobber, splash, swing/retrieve,
+ * generate fishing loot, discard the bobber, count the catch, and damage the rod. SettlementOrderWorkGoal
+ * owns that same observable output for settlement FISH orders.</p>
+ */
+class FishermanWorkGoalMigrationContractTest {
+ private static final Path ROOT = Path.of("");
+
+ private static final String FISHERMAN_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/FishermanEntity.java";
+ private static final String ABSTRACT_WORKER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/AbstractWorkerEntity.java";
+ private static final String LEGACY_FISHERMAN_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/FishermanWorkGoal.java";
+ private static final String SETTLEMENT_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java";
+ private static final String FISHING_PUBLISHER =
+ "src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/FishingAreaWorkOrderPublisher.java";
+
+ @Test
+ void fishermanRegistersSettlementOrderWorkGoalOnly() throws IOException {
+ String fisherman = read(FISHERMAN_ENTITY);
+ String worker = read(ABSTRACT_WORKER_ENTITY);
+
+ assertFalse(Files.exists(ROOT.resolve(LEGACY_FISHERMAN_GOAL)),
+ "FishermanWorkGoal must be deleted from src/main");
+ assertTrue(worker.contains("new SettlementOrderWorkGoal(this)"),
+ "AbstractWorkerEntity must execute settlement work orders for fishermen through super.registerGoals()");
+ assertFalse(fisherman.contains("FishermanWorkGoal"),
+ "FishermanEntity must not reference the legacy fisherman goal");
+ assertFalse(fisherman.contains("new SettlementOrderWorkGoal(this)"),
+ "FishermanEntity must not register a duplicate settlement-order goal");
+ }
+
+ @Test
+ void fishingAreaOrdersFeedTheGenericFishingOutputPath() throws IOException {
+ String publisher = read(FISHING_PUBLISHER);
+ String goal = read(SETTLEMENT_GOAL);
+
+ assertTrue(publisher.contains("SettlementWorkOrderType.FISH"),
+ "publisher must label fixed fishing targets as FISH orders");
+ assertTrue(publisher.contains("fishingArea.getOnPos().immutable()"),
+ "publisher must emit the fixed fishing-area target position");
+
+ int fishCase = goal.indexOf("case FISH");
+ int executableGate = goal.indexOf("private static boolean isExecutableOrder");
+ int executableFish = goal.indexOf("FISH", executableGate);
+ int switchRod = goal.indexOf("fisherman.switchMainHandItem", fishCase);
+ int throwSwing = goal.indexOf("fisherman.swing(InteractionHand.MAIN_HAND)", switchRod);
+ int throwSound = goal.indexOf("SoundEvents.FISHING_BOBBER_THROW", throwSwing);
+ int throwHook = goal.indexOf("fisherman.throwFishingHook(target.getCenter())", throwSound);
+ int splashSound = goal.indexOf("SoundEvents.FISHING_BOBBER_SPLASH", throwHook);
+ int retrieveSwing = goal.indexOf("fisherman.swing(InteractionHand.MAIN_HAND)", splashSound);
+ int retrieveSound = goal.indexOf("SoundEvents.FISHING_BOBBER_RETRIEVE", retrieveSwing);
+ int spawnLoot = goal.indexOf("fisherman.spawnFishingLoot(fishingBobber)", retrieveSound);
+ int discard = goal.indexOf("fishingBobber.discard()", spawnLoot);
+ int countCatch = goal.indexOf("fisherman.farmedItems++", discard);
+ int damageRod = goal.indexOf("fisherman.damageMainHandItem()", countCatch);
+ int complete = goal.indexOf("completeActiveOrder(runtime, level)", damageRod);
+
+ assertTrue(fishCase >= 0, "SettlementOrderWorkGoal must handle FISH orders");
+ assertTrue(executableFish > executableGate,
+ "SettlementOrderWorkGoal must accept FISH orders before the FISH path can run");
+ assertTrue(switchRod > fishCase,
+ "fixed fishing target must select a fishing rod before casting");
+ assertTrue(throwSwing > switchRod,
+ "fixed fishing target must swing before the throw sound, matching FishermanWorkGoal output");
+ assertTrue(throwSound > throwSwing,
+ "fixed fishing target must play the throw sound after swinging");
+ assertTrue(throwHook > throwSound,
+ "fixed fishing target must spawn a fishing bobber after the throw sound");
+ assertTrue(splashSound > throwHook,
+ "fixed fishing target must reach the splash/catch output path");
+ assertTrue(retrieveSwing > splashSound,
+ "fixed fishing target must swing to retrieve after the splash");
+ assertTrue(retrieveSound > retrieveSwing,
+ "fixed fishing target must play the retrieve sound after swinging");
+ assertTrue(spawnLoot > retrieveSound,
+ "fixed fishing target must generate fishing loot after retrieval");
+ assertTrue(discard > spawnLoot,
+ "fixed fishing target must discard the bobber after loot generation");
+ assertTrue(countCatch > discard,
+ "fixed fishing target must increment the farmed item counter");
+ assertTrue(damageRod > countCatch,
+ "fixed fishing target must damage the rod after counting the catch");
+ assertTrue(complete > damageRod,
+ "fixed fishing target must complete the settlement work order after legacy-equivalent output");
+ }
+
+ private String read(String relativePath) throws IOException {
+ return Files.readString(ROOT.resolve(relativePath));
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/HandlerClaimBehaviorTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/HandlerClaimBehaviorTest.java
index 53b65eab..842925f4 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/workorder/HandlerClaimBehaviorTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/HandlerClaimBehaviorTest.java
@@ -1,14 +1,14 @@
package com.talhanation.bannermod.settlement.workorder;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentAssignmentState;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentMode;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRole;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentRuntimeRoleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentScheduleWindowSeed;
-import com.talhanation.bannermod.settlement.BannerModSettlementResidentServiceContract;
-import com.talhanation.bannermod.settlement.BannerModSettlementServiceActorState;
+import com.talhanation.bannermod.settlement.SettlementResidentAssignmentState;
+import com.talhanation.bannermod.settlement.SettlementResidentMode;
+import com.talhanation.bannermod.settlement.SettlementResidentRecord;
+import com.talhanation.bannermod.settlement.SettlementResidentRole;
+import com.talhanation.bannermod.settlement.SettlementResidentRuntimeRoleState;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentScheduleWindowSeed;
+import com.talhanation.bannermod.settlement.SettlementResidentServiceContract;
+import com.talhanation.bannermod.settlement.SettlementServiceActorState;
import com.talhanation.bannermod.settlement.job.BuildJobHandler;
import com.talhanation.bannermod.settlement.job.HarvestJobHandler;
import com.talhanation.bannermod.settlement.job.JobExecutionContext;
@@ -33,7 +33,7 @@ void harvestHandlerClaimsMatchingFarmingOrderFromRuntime() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
SettlementWorkOrderType.HARVEST_CROP, new BlockPos(1, 64, 1), null, 80, 10L));
- BannerModSettlementResidentRecord resident = controlledResident();
+ SettlementResidentRecord resident = controlledResident();
JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
HarvestJobHandler handler = new HarvestJobHandler();
@@ -49,7 +49,7 @@ void harvestHandlerClaimsMatchingFarmingOrderFromRuntime() {
@Test
void harvestHandlerReturnsBlockedWhenNoOrderAvailable() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
- BannerModSettlementResidentRecord resident = controlledResident();
+ SettlementResidentRecord resident = controlledResident();
JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
JobExecutionResult result = new HarvestJobHandler().runOneStep(ctx);
@@ -64,7 +64,7 @@ void harvestHandlerKeepsExistingClaimAcrossSteps() {
SettlementWorkOrderType.HARVEST_CROP, new BlockPos(1, 64, 1), null, 80, 10L));
runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
SettlementWorkOrderType.HARVEST_CROP, new BlockPos(1, 64, 2), null, 80, 12L));
- BannerModSettlementResidentRecord resident = controlledResident();
+ SettlementResidentRecord resident = controlledResident();
JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
HarvestJobHandler handler = new HarvestJobHandler();
@@ -82,7 +82,7 @@ void harvestHandlerRejectsConstructionOrder() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
SettlementWorkOrderType.BUILD_BLOCK, new BlockPos(1, 64, 1), null, 80, 10L));
- BannerModSettlementResidentRecord resident = controlledResident();
+ SettlementResidentRecord resident = controlledResident();
JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
JobExecutionResult result = new HarvestJobHandler().runOneStep(ctx);
@@ -96,7 +96,7 @@ void buildHandlerClaimsMatchingConstructionOrder() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
SettlementWorkOrderType.BUILD_BLOCK, new BlockPos(1, 64, 1), null, 70, 10L));
- BannerModSettlementResidentRecord resident = controlledResident();
+ SettlementResidentRecord resident = controlledResident();
JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
JobExecutionResult result = new BuildJobHandler().runOneStep(ctx);
@@ -105,12 +105,26 @@ void buildHandlerClaimsMatchingConstructionOrder() {
assertTrue(runtime.currentClaim(RESIDENT).isPresent());
}
+ @Test
+ void buildHandlerClaimsAnimalOrderForAssignedPen() {
+ SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
+ runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
+ SettlementWorkOrderType.ANIMAL_BREED, new BlockPos(1, 64, 1), null, 90, 10L));
+ SettlementResidentRecord resident = controlledResident("animal_pen_area");
+ JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
+
+ JobExecutionResult result = new BuildJobHandler().runOneStep(ctx);
+
+ assertEquals(JobExecutionResult.COMPLETED, result);
+ assertEquals(SettlementWorkOrderType.ANIMAL_BREED, runtime.currentClaim(RESIDENT).orElseThrow().type());
+ }
+
@Test
void buildHandlerIgnoresFarmingOrder() {
SettlementWorkOrderRuntime runtime = new SettlementWorkOrderRuntime();
runtime.publish(SettlementWorkOrder.pending(CLAIM, BUILDING,
SettlementWorkOrderType.HARVEST_CROP, new BlockPos(1, 64, 1), null, 80, 10L));
- BannerModSettlementResidentRecord resident = controlledResident();
+ SettlementResidentRecord resident = controlledResident();
JobExecutionContext ctx = new JobExecutionContext(resident, 100L, RESIDENT, BUILDING, runtime);
JobExecutionResult result = new BuildJobHandler().runOneStep(ctx);
@@ -119,23 +133,27 @@ void buildHandlerIgnoresFarmingOrder() {
assertFalse(runtime.currentClaim(RESIDENT).isPresent());
}
- private static BannerModSettlementResidentRecord controlledResident() {
- BannerModSettlementResidentServiceContract serviceContract = new BannerModSettlementResidentServiceContract(
- BannerModSettlementServiceActorState.LOCAL_BUILDING_SERVICE,
+ private static SettlementResidentRecord controlledResident() {
+ return controlledResident("crop_area");
+ }
+
+ private static SettlementResidentRecord controlledResident(String buildingTypeId) {
+ SettlementResidentServiceContract serviceContract = new SettlementResidentServiceContract(
+ SettlementServiceActorState.LOCAL_BUILDING_SERVICE,
BUILDING,
- "crop_area"
+ buildingTypeId
);
- return new BannerModSettlementResidentRecord(
+ return new SettlementResidentRecord(
RESIDENT,
- BannerModSettlementResidentRole.CONTROLLED_WORKER,
- BannerModSettlementResidentScheduleSeed.ASSIGNED_WORK,
- BannerModSettlementResidentRuntimeRoleSeed.LOCAL_LABOR,
+ SettlementResidentRole.CONTROLLED_WORKER,
+ SettlementResidentScheduleSeed.ASSIGNED_WORK,
+ SettlementResidentRuntimeRoleState.LOCAL_LABOR,
serviceContract,
- BannerModSettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
+ SettlementResidentMode.PROJECTED_CONTROLLED_WORKER,
UUID.fromString("00000000-0000-0000-0000-0000000000d1"),
"teamA",
BUILDING,
- BannerModSettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
+ SettlementResidentAssignmentState.ASSIGNED_LOCAL_BUILDING
);
}
}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/LumberjackWorkGoalMigrationContractTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/LumberjackWorkGoalMigrationContractTest.java
new file mode 100644
index 00000000..585fec1f
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/LumberjackWorkGoalMigrationContractTest.java
@@ -0,0 +1,90 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Source-level migration contract for WORKGOAL-005.
+ *
+ * <p>The legacy LumberjackWorkGoal fixed wood-cutting output for a selected log was:
+ * call mineBlock(target), then swing the main hand. The generic SettlementOrderWorkGoal
+ * FELL_TREE branch owns the same observable world mutation path for settlement tree orders.
+ */
+class LumberjackWorkGoalMigrationContractTest {
+ private static final Path ROOT = Path.of("");
+
+ private static final String LUMBERJACK_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/LumberjackEntity.java";
+ private static final String ABSTRACT_WORKER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/AbstractWorkerEntity.java";
+ private static final String LEGACY_LUMBERJACK_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/LumberjackWorkGoal.java";
+ private static final String SETTLEMENT_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java";
+ private static final String LUMBER_PUBLISHER =
+ "src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/LumberAreaWorkOrderPublisher.java";
+
+ @Test
+ void lumberjackRegistersSettlementOrderWorkGoalOnly() throws IOException {
+ String lumberjack = read(LUMBERJACK_ENTITY);
+ String worker = read(ABSTRACT_WORKER_ENTITY);
+
+ assertFalse(Files.exists(ROOT.resolve(LEGACY_LUMBERJACK_GOAL)),
+ "LumberjackWorkGoal must be deleted from src/main");
+ assertTrue(worker.contains("new SettlementOrderWorkGoal(this)"),
+ "AbstractWorkerEntity must execute settlement work orders for lumberjacks through super.registerGoals()");
+ assertFalse(lumberjack.contains("new SettlementOrderWorkGoal(this)"),
+ "LumberjackEntity must not register a duplicate settlement-order goal");
+ assertFalse(lumberjack.contains("LumberjackWorkGoal"),
+ "LumberjackEntity must not reference the legacy lumberjack goal");
+ }
+
+ @Test
+ void lumberAreaOrdersFeedTheGenericFellTreeOutputPath() throws IOException {
+ String publisher = read(LUMBER_PUBLISHER);
+ String goal = read(SETTLEMENT_GOAL);
+
+ assertTrue(publisher.contains("lumberArea.scanForTrees()"),
+ "lumber orders must come from the same scanned tree targets as LumberjackWorkGoal");
+ assertTrue(publisher.contains("for (Tree tree : lumberArea.stackOfTrees)"),
+ "publisher must emit one order per fixed tree target");
+ assertTrue(publisher.contains("SettlementWorkOrderType.FELL_TREE"),
+ "publisher must label those targets as FELL_TREE orders");
+
+ int fellCase = goal.indexOf("FELL_TREE");
+ int mineCall = goal.indexOf("worker.mineBlock(target)", fellCase);
+ int swingCall = goal.indexOf("worker.swing(InteractionHand.MAIN_HAND)", mineCall);
+
+ assertTrue(fellCase >= 0, "SettlementOrderWorkGoal must handle FELL_TREE orders");
+ assertTrue(mineCall > fellCase,
+ "fixed solid FELL_TREE target must call mineBlock(target), matching LumberjackWorkGoal output");
+ assertTrue(swingCall > mineCall,
+ "fixed solid FELL_TREE target must swing after mining, matching LumberjackWorkGoal output");
+ }
+
+ @Test
+ void fellTreeCompletionMatchesLegacyEmptyTargetOutput() throws IOException {
+ String goal = read(SETTLEMENT_GOAL);
+ int fellCase = goal.indexOf("FELL_TREE");
+ int airCheck = goal.indexOf("state.isAir()", fellCase);
+ int brokenCheck = goal.indexOf("AbstractWorkerEntity.isPosBroken(target, level, true)", fellCase);
+ int complete = goal.indexOf("completeActiveOrder(runtime, level)", fellCase);
+
+ assertTrue(airCheck > fellCase,
+ "empty fixed fell-tree targets must be treated as already handled");
+ assertTrue(brokenCheck > airCheck,
+ "externally broken fixed fell-tree targets must be treated as already handled");
+ assertTrue(complete > brokenCheck,
+ "completed/empty FELL_TREE targets must close the order instead of emitting extra output");
+ }
+
+ private String read(String relativePath) throws IOException {
+ return Files.readString(ROOT.resolve(relativePath));
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/MerchantWorkGoalMigrationContractTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/MerchantWorkGoalMigrationContractTest.java
new file mode 100644
index 00000000..4db83fd3
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/MerchantWorkGoalMigrationContractTest.java
@@ -0,0 +1,89 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Source-level migration contract for WORKGOAL-006.
+ *
+ * <p>For a fixed enabled trade where the merchant has the trade good, the player can pay,
+ * and both inventories have room, the observable output must remain: remove merchant goods,
+ * move currency to the merchant, remove currency from the player, grant the trade good,
+ * increment the trade counter, persist trades, and refresh the settlement snapshot.</p>
+ */
+class MerchantWorkGoalMigrationContractTest {
+ private static final Path ROOT = Path.of("");
+
+ private static final String MERCHANT_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/MerchantEntity.java";
+ private static final String ABSTRACT_WORKER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/AbstractWorkerEntity.java";
+ private static final String LEGACY_MERCHANT_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/MerchantWorkGoal.java";
+
+ @Test
+ void merchantRegistersSettlementOrderWorkGoalOnly() throws IOException {
+ String merchant = read(MERCHANT_ENTITY);
+ String worker = read(ABSTRACT_WORKER_ENTITY);
+
+ assertFalse(Files.exists(ROOT.resolve(LEGACY_MERCHANT_GOAL)),
+ "MerchantWorkGoal must be deleted from src/main");
+ assertTrue(worker.contains("new SettlementOrderWorkGoal(this)"),
+ "AbstractWorkerEntity must execute settlement work orders for merchants through super.registerGoals()");
+ assertFalse(merchant.contains("protected void registerGoals()"),
+ "MerchantEntity must inherit the single settlement-order goal registration from AbstractWorkerEntity");
+ assertFalse(merchant.contains("MerchantWorkGoal"),
+ "MerchantEntity must not reference the legacy merchant goal");
+ assertFalse(merchant.contains("new SettlementOrderWorkGoal(this)"),
+ "MerchantEntity must not register a duplicate settlement-order goal");
+ }
+
+ @Test
+ void fixedSuccessfulTradeOutputRemainsOwnedByMerchantEntity() throws IOException {
+ String merchant = read(MERCHANT_ENTITY);
+
+ int enabledCheck = merchant.indexOf("if(!trade.enabled) return");
+ int countMerchantGood = merchant.indexOf("this.countMerchantItemStack(tradeItemStack, false)", enabledCheck);
+ int playerCanPay = merchant.indexOf("boolean playerCanPay = playerEmeralds >= price", countMerchantGood);
+ int merchantCanReceiveCurrency = merchant.indexOf("boolean canAddItemToInv = canAddItemToMerchant(currencyItem)", playerCanPay);
+ int shrinkMerchantGood = merchant.indexOf("shrinkMerchantItemStack(tradeItemStack, tradeCount, false)", merchantCanReceiveCurrency);
+ int addCurrencyToMerchant = merchant.indexOf("addItemToMerchant(itemStackInSlot, amount)", shrinkMerchantGood);
+ int shrinkPlayerCurrency = merchant.indexOf("itemStackInSlot.shrink(amount)", addCurrencyToMerchant);
+ int grantTradeGood = merchant.indexOf("addItemWithMaxStackCount(playerInv, tradeGood, tradeCount)", shrinkPlayerCurrency);
+ int incrementTradeCount = merchant.indexOf("trade.currentTrades++", grantTradeGood);
+ int persistTrades = merchant.indexOf("this.setTrades(currents)", incrementTradeCount);
+ int refreshSettlement = merchant.indexOf("this.refreshSettlementSnapshot()", persistTrades);
+
+ assertTrue(enabledCheck >= 0, "fixed trade scenario must start from an enabled trade");
+ assertTrue(countMerchantGood > enabledCheck,
+ "successful trade must verify merchant goods before mutating output");
+ assertTrue(playerCanPay > countMerchantGood,
+ "successful trade must verify player currency before mutating output");
+ assertTrue(merchantCanReceiveCurrency > playerCanPay,
+ "successful trade must verify merchant currency capacity before mutating output");
+ assertTrue(shrinkMerchantGood > merchantCanReceiveCurrency,
+ "successful fixed trade must remove the merchant good, matching legacy output");
+ assertTrue(addCurrencyToMerchant > shrinkMerchantGood,
+ "successful fixed trade must move currency to the merchant, matching legacy output");
+ assertTrue(shrinkPlayerCurrency > addCurrencyToMerchant,
+ "successful fixed trade must remove paid currency from the player, matching legacy output");
+ assertTrue(grantTradeGood > shrinkPlayerCurrency,
+ "successful fixed trade must grant the trade good, matching legacy output");
+ assertTrue(incrementTradeCount > grantTradeGood,
+ "successful fixed trade must increment the trade counter, matching legacy output");
+ assertTrue(persistTrades > incrementTradeCount,
+ "successful fixed trade must persist the updated trade list");
+ assertTrue(refreshSettlement > persistTrades,
+ "successful fixed trade must refresh the settlement snapshot after persisted output");
+ }
+
+ private String read(String relativePath) throws IOException {
+ return Files.readString(ROOT.resolve(relativePath));
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/MinerWorkGoalMigrationContractTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/MinerWorkGoalMigrationContractTest.java
new file mode 100644
index 00000000..bf4c0d77
--- /dev/null
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/MinerWorkGoalMigrationContractTest.java
@@ -0,0 +1,91 @@
+package com.talhanation.bannermod.settlement.workorder;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Source-level migration contract for WORKGOAL-003.
+ *
+ * <p>The legacy MinerWorkGoal mine-block output for a fixed solid target was:
+ * change to a valid tool, call mineBlock(target), then swing the main hand. The generic
+ * SettlementOrderWorkGoal mine-block branch owns the same observable world mutation path for
+ * settlement MINE_BLOCK orders.
+ */
+class MinerWorkGoalMigrationContractTest {
+ private static final Path ROOT = Path.of("");
+
+ private static final String MINER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/MinerEntity.java";
+ private static final String ABSTRACT_WORKER_ENTITY =
+ "src/main/java/com/talhanation/bannermod/entity/civilian/AbstractWorkerEntity.java";
+ private static final String LEGACY_MINER_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/MinerWorkGoal.java";
+ private static final String SETTLEMENT_GOAL =
+ "src/main/java/com/talhanation/bannermod/ai/civilian/SettlementOrderWorkGoal.java";
+ private static final String MINING_PUBLISHER =
+ "src/main/java/com/talhanation/bannermod/settlement/workorder/publisher/MiningAreaWorkOrderPublisher.java";
+
+ @Test
+ void minerRegistersSettlementOrderWorkGoalOnly() throws IOException {
+ String miner = read(MINER_ENTITY);
+ String worker = read(ABSTRACT_WORKER_ENTITY);
+
+ assertFalse(Files.exists(ROOT.resolve(LEGACY_MINER_GOAL)),
+ "MinerWorkGoal must be deleted from src/main");
+ assertTrue(worker.contains("new SettlementOrderWorkGoal(this)"),
+ "AbstractWorkerEntity must execute settlement work orders for miners through super.registerGoals()");
+ assertFalse(miner.contains("new SettlementOrderWorkGoal(this)"),
+ "MinerEntity must not register a duplicate settlement-order goal");
+ assertFalse(miner.contains("MinerWorkGoal"),
+ "MinerEntity must not reference the legacy miner goal");
+ }
+
+ @Test
+ void miningAreaOrdersFeedTheGenericMineBlockOutputPath() throws IOException {
+ String publisher = read(MINING_PUBLISHER);
+ String goal = read(SETTLEMENT_GOAL);
+
+ assertTrue(publisher.contains("miningArea.scanBreakArea()"),
+ "mining orders must come from the same scanned break targets as MinerWorkGoal");
+ assertTrue(publisher.contains("for (BlockPos pos : miningArea.stackToBreak)"),
+ "publisher must emit one order per fixed mine-block target");
+ assertTrue(publisher.contains("SettlementWorkOrderType.MINE_BLOCK"),
+ "publisher must label those targets as MINE_BLOCK orders");
+
+ int mineCase = goal.indexOf("MINE_BLOCK");
+ int mineCall = goal.indexOf("worker.mineBlock(target)", mineCase);
+ int swingCall = goal.indexOf("worker.swing(InteractionHand.MAIN_HAND)", mineCall);
+
+ assertTrue(mineCase >= 0, "SettlementOrderWorkGoal must handle MINE_BLOCK orders");
+ assertTrue(mineCall > mineCase,
+ "fixed solid MINE_BLOCK target must call mineBlock(target), matching MinerWorkGoal output");
+ assertTrue(swingCall > mineCall,
+ "fixed solid MINE_BLOCK target must swing after mining, matching MinerWorkGoal output");
+ }
+
+ @Test
+ void mineBlockCompletionMatchesLegacyEmptyTargetOutput() throws IOException {
+ String goal = read(SETTLEMENT_GOAL);
+ int mineCase = goal.indexOf("MINE_BLOCK");
+ int airCheck = goal.indexOf("state.isAir()", mineCase);
+ int brokenCheck = goal.indexOf("AbstractWorkerEntity.isPosBroken(target, level, true)", mineCase);
+ int complete = goal.indexOf("completeActiveOrder(runtime, level)", mineCase);
+
+ assertTrue(airCheck > mineCase,
+ "empty fixed mine-block targets must be treated as already handled");
+ assertTrue(brokenCheck > airCheck,
+ "externally broken fixed mine-block targets must be treated as already handled");
+ assertTrue(complete > brokenCheck,
+ "completed/empty MINE_BLOCK targets must close the order instead of emitting extra output");
+ }
+
+ private String read(String relativePath) throws IOException {
+ return Files.readString(ROOT.resolve(relativePath));
+ }
+}
diff --git a/src/test/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistryTest.java b/src/test/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistryTest.java
index ea167039..ccc09559 100644
--- a/src/test/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistryTest.java
+++ b/src/test/java/com/talhanation/bannermod/settlement/workorder/SettlementWorkOrderPublisherRegistryTest.java
@@ -1,6 +1,6 @@
package com.talhanation.bannermod.settlement.workorder;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -13,8 +13,8 @@ class SettlementWorkOrderPublisherRegistryTest {
@Test
void matchesBuildingTypeAcceptsBareAndNamespacedIds() {
- BannerModSettlementBuildingRecord namespaced = building("bannermod:crop_area");
- BannerModSettlementBuildingRecord bare = building("crop_area");
+ SettlementBuildingRecord namespaced = building("bannermod:crop_area");
+ SettlementBuildingRecord bare = building("crop_area");
assertTrue(SettlementWorkOrderPublisherRegistry.matchesBuildingType(namespaced, "crop_area"));
assertTrue(SettlementWorkOrderPublisherRegistry.matchesBuildingType(bare, "crop_area"));
@@ -22,15 +22,15 @@ void matchesBuildingTypeAcceptsBareAndNamespacedIds() {
@Test
void matchesBuildingTypeRejectsDifferentTypeOrInvalidInput() {
- BannerModSettlementBuildingRecord building = building("bannermod:mining_area");
+ SettlementBuildingRecord building = building("bannermod:mining_area");
assertFalse(SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, "crop_area"));
assertFalse(SettlementWorkOrderPublisherRegistry.matchesBuildingType(null, "crop_area"));
assertFalse(SettlementWorkOrderPublisherRegistry.matchesBuildingType(building, null));
}
- private static BannerModSettlementBuildingRecord building(String typeId) {
- return new BannerModSettlementBuildingRecord(
+ private static SettlementBuildingRecord building(String typeId) {
+ return new SettlementBuildingRecord(
UUID.randomUUID(),
typeId,
null,
diff --git a/src/test/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicyTest.java b/src/test/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicyTest.java
index e68443a9..3dfd554e 100644
--- a/src/test/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicyTest.java
+++ b/src/test/java/com/talhanation/bannermod/war/registry/PoliticalStatePromotionPolicyTest.java
@@ -1,7 +1,7 @@
package com.talhanation.bannermod.war.registry;
-import com.talhanation.bannermod.settlement.BannerModSettlementBuildingRecord;
-import com.talhanation.bannermod.settlement.BannerModSettlementSnapshot;
+import com.talhanation.bannermod.settlement.SettlementBuildingRecord;
+import com.talhanation.bannermod.settlement.SettlementSnapshot;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import org.junit.jupiter.api.Test;
@@ -17,7 +17,7 @@ class PoliticalStatePromotionPolicyTest {
@Test
void rejectsPromotionWithoutRequiredInfrastructure() {
- BannerModSettlementSnapshot snapshot = snapshot(List.of(building("bannermod:storage_area")));
+ SettlementSnapshot snapshot = snapshot(List.of(building("bannermod:storage_area")));
PoliticalStatePromotionPolicy.Result result = PoliticalStatePromotionPolicy.evaluate(snapshot);
@@ -29,7 +29,7 @@ void rejectsPromotionWithoutRequiredInfrastructure() {
@Test
void allowsPromotionWithCoreStorageAndMarket() {
- BannerModSettlementSnapshot snapshot = snapshot(List.of(
+ SettlementSnapshot snapshot = snapshot(List.of(
building("bannermod:starter_fort"),
building("bannermod:storage_area"),
building("bannermod:market_area")
@@ -40,9 +40,9 @@ void allowsPromotionWithCoreStorageAndMarket() {
assertTrue(result.allowed());
}
- private static BannerModSettlementSnapshot snapshot(List<BannerModSettlementBuildingRecord> buildings) {
- BannerModSettlementSnapshot empty = BannerModSettlementSnapshot.create(CLAIM, new ChunkPos(0, 0), null);
- return new BannerModSettlementSnapshot(
+ private static SettlementSnapshot snapshot(List<SettlementBuildingRecord> buildings) {
+ SettlementSnapshot empty = SettlementSnapshot.create(CLAIM, new ChunkPos(0, 0), null);
+ return new SettlementSnapshot(
empty.claimUuid(),
empty.anchorChunkX(),
empty.anchorChunkZ(),
@@ -56,17 +56,17 @@ private static BannerModSettlementSnapshot snapshot(List<BannerModSettlementBuil
empty.missingWorkAreaAssignmentCount(),
empty.stockpileSummary(),
empty.marketState(),
- empty.desiredGoodsSeed(),
- empty.projectCandidateSeed(),
- empty.tradeRouteHandoffSeed(),
+ empty.desiredGoodsSnapshot(),
+ empty.projectCandidateSnapshot(),
+ empty.tradeRouteHandoffSnapshot(),
empty.supplySignalState(),
empty.residents(),
buildings
);
}
- private static BannerModSettlementBuildingRecord building(String typeId) {
- return new BannerModSettlementBuildingRecord(
+ private static SettlementBuildingRecord building(String typeId) {
+ return new SettlementBuildingRecord(
UUID.randomUUID(),
typeId,
BlockPos.ZERO,