Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Concrete mixer can do multiple things before going back to the hut #10331

Merged
merged 4 commits into from
Nov 24, 2024

Conversation

Thodor12
Copy link
Contributor

Closes #10209

Changes proposed in this pull request

  • Introduced 2 new AI stages for placing and harvesting, so that the AI may be kept in a placing/harvesting stage until everything is done at once.

Testing

  • Yes I tested this before submitting it.
  • I also did a multiplayer test.

Review please

{
for (final BlockPos pos : waterPos.getOrDefault(i, Collections.emptyList()))
{
final BlockState state = colony.getWorld().getBlockState(pos);
if (!state.getFluidState().isEmpty() && state.getBlock() == Blocks.WATER)
if (state.is(Blocks.WATER))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flowing water is not water though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well I tested this, and it is.

If a block contains flowing water the block is still marked as containing water, the fluid state however just lists a different water depth.
There's no need for a depth check because the waterPos already has determined the required water level should be good in the schematic.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please double check this. Because at least in some cases as far as I am aware, if air gets some low level water into it, it's fluidstate not empty, but actual state is not water.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ping

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even if that is the case with low level water, then it's a non issue, because we only support up to a max depth of 5, and it worked correctly for every depth we support.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For reference I had a debugger out, and every level it's blockstate was set to being the actual block of water, disregarding how high the water actually was

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've double checked it again and it works fine. On top of that we already calculate the actual positions during construction, so I need not worry about calculating the depth of the water because the position itself is calculated to have water in it.
So that means we know the position is valid, so as long as there's then some water in it again, we're fine.

@Raycoms Raycoms added this pull request to the merge queue Nov 24, 2024
@marchermans marchermans removed this pull request from the merge queue due to the queue being cleared Nov 24, 2024
@Raycoms Raycoms merged commit bcf78ba into version/main Nov 24, 2024
5 checks passed
@Raycoms Raycoms deleted the fix/concrete_mixer_logic branch November 24, 2024 12:15
Raycoms added a commit that referenced this pull request Nov 27, 2024
…10331)

Concrete mixer can do multiple things before going back to the hut
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

The concrete mixer's movements seem strange while working.
3 participants