OrekiWoof/OrekiWoofsBeehives
Private
Public Access
1
0
Fork 0
Code Issues 2 Pull Requests Activity

adjust candidate home text conditions in blockinfo

Browse Source
This commit is contained in:
OrekiWoof
2026-03-21 02:38:52 +01:00
parent b064945106
commit ff16231ca0
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
OrekiWoofsBeehives/BlockEntities/BlockEntityBeeSwarm.cs
View File

@@ -29,7 +29,7 @@ public class BlockEntityBeeSwarm : BlockEntity
private BlockPos? targetPos; private BlockPos? targetPos;
private bool targetIsVanillaSkep; private bool targetIsVanillaSkep;
private string? targetPopulatedSkepCode; private string? targetPopulatedSkepCode;
private int eligibleTargetsAtLastSelection; private int? eligibleTargetsAtLastSelection;
private List<SwarmTargetCandidate>? targetHiveCandidates; private List<SwarmTargetCandidate>? targetHiveCandidates;
private long? candidateRefreshListenerId; private long? candidateRefreshListenerId;
@@ -45,7 +45,7 @@ public class BlockEntityBeeSwarm : BlockEntity
if (api.Side != EnumAppSide.Server) if (api.Side != EnumAppSide.Server)
return; return;
if (SwarmState == SwarmState.HangingOut) if (SwarmState is SwarmState.BuildingSwarm or SwarmState.HangingOut)
StartCandidateRefresh(); StartCandidateRefresh();
FastForwardTo(api.World.Calendar.TotalHours, debugAsCatchUp: true); FastForwardTo(api.World.Calendar.TotalHours, debugAsCatchUp: true);
@@ -70,7 +70,6 @@ public class BlockEntityBeeSwarm : BlockEntity
targetPos = null; targetPos = null;
targetIsVanillaSkep = false; targetIsVanillaSkep = false;
targetPopulatedSkepCode = null; targetPopulatedSkepCode = null;
eligibleTargetsAtLastSelection = 0;
targetHiveCandidates = null; targetHiveCandidates = null;
migrationStartPopulation = 0; migrationStartPopulation = 0;
transferredDuringMigration = 0; transferredDuringMigration = 0;
@@ -87,7 +86,7 @@ public class BlockEntityBeeSwarm : BlockEntity
private void OnCandidateRefreshTick(float dt) private void OnCandidateRefreshTick(float dt)
{ {
if (Api.Side != EnumAppSide.Server || SwarmState != SwarmState.HangingOut) if (Api.Side != EnumAppSide.Server)
return; return;
targetHiveCandidates = FindEligibleTargets(); targetHiveCandidates = FindEligibleTargets();
@@ -470,8 +469,14 @@ public class BlockEntityBeeSwarm : BlockEntity
dsc.AppendLine(GetPhaseStatusLine()); dsc.AppendLine(GetPhaseStatusLine());
dsc.AppendLine(Lang.Get("orekiwoofsbeehives:beeswarm-info-population", Population.ToString("N0"))); dsc.AppendLine(Lang.Get("orekiwoofsbeehives:beeswarm-info-population", Population.ToString("N0")));
if (SwarmState is SwarmState.MigratingToNewHive)
return;
var eligibleTargets = targetHiveCandidates?.Count ?? eligibleTargetsAtLastSelection; var eligibleTargets = targetHiveCandidates?.Count ?? eligibleTargetsAtLastSelection;
dsc.AppendLine(Lang.Get("orekiwoofsbeehives:beeswarm-info-eligible-targets", eligibleTargets));
if (!eligibleTargets.HasValue)
return;
dsc.AppendLine(Lang.Get("orekiwoofsbeehives:beeswarm-info-eligible-targets", eligibleTargets.Value));
} }
private string GetPhaseStatusLine() private string GetPhaseStatusLine()
@@ -589,7 +594,8 @@ public class BlockEntityBeeSwarm : BlockEntity
tree.SetInt("retryDay", retryDay); tree.SetInt("retryDay", retryDay);
tree.SetBool("targetIsVanillaSkep", targetIsVanillaSkep); tree.SetBool("targetIsVanillaSkep", targetIsVanillaSkep);
tree.SetString("targetPopulatedSkepCode", targetPopulatedSkepCode ?? string.Empty); tree.SetString("targetPopulatedSkepCode", targetPopulatedSkepCode ?? string.Empty);
tree.SetInt("eligibleTargetsAtLastSelection", eligibleTargetsAtLastSelection); if (eligibleTargetsAtLastSelection.HasValue)
tree.SetInt("eligibleTargetsAtLastSelection", eligibleTargetsAtLastSelection.Value);
// for roamingbees // for roamingbees
tree.SetInt("roamingbees_swarm_state", (int)SwarmState); tree.SetInt("roamingbees_swarm_state", (int)SwarmState);
@@ -638,7 +644,9 @@ public class BlockEntityBeeSwarm : BlockEntity
retryDay = tree.GetInt("retryDay"); retryDay = tree.GetInt("retryDay");
targetIsVanillaSkep = tree.GetBool("targetIsVanillaSkep"); targetIsVanillaSkep = tree.GetBool("targetIsVanillaSkep");
targetPopulatedSkepCode = tree.GetString("targetPopulatedSkepCode"); targetPopulatedSkepCode = tree.GetString("targetPopulatedSkepCode");
eligibleTargetsAtLastSelection = tree.GetInt("eligibleTargetsAtLastSelection"); eligibleTargetsAtLastSelection = tree.HasAttribute("eligibleTargetsAtLastSelection")
? tree.GetInt("eligibleTargetsAtLastSelection")
: null;
targetPos = tree.GetBlockPos("targetPos"); targetPos = tree.GetBlockPos("targetPos");
} }