Add support for fluid tanks in feeding slabs #625
Conversation
| } else { | ||
| IFluidHandler stackFluidTank = stack.getCapability(Capabilities.FluidHandler.ITEM); | ||
| if (stackFluidTank != null && stackFluidTank.getFluidInTank(0).getAmount() >= ProductiveBeesConfig.BEES.minimumMbForFlowering.get()) { | ||
| possibleBlocks.add(stackFluidTank.getFluidInTank(0).getFluid().defaultFluidState().createLegacyBlock().getBlock()); |
There was a problem hiding this comment.
what about fluids that don't have blocks?
There was a problem hiding this comment.
Afaik, there's no way for fluids without blocks to be used right now so it would be consistent with the current behavior, but if I'm wrong or you want it to work for fluids without blocks, I would need to modify the call to be TagKey<Item> tag rather than TagKey<Block> tag which I'm fine doing, I was just trying not to change the existing code too much.
| @@ -428,7 +431,7 @@ public boolean isFlowerBlock(BlockState flowerBlock) { | |||
| return flowerBlock.is(flowerTag); | |||
| } else if (nbt.contains("flowerBlock")) { | |||
| return BuiltInRegistries.BLOCK.getKey(flowerBlock.getBlock()).toString().equals(nbt.getString("flowerBlock")); | |||
| } else if (nbt.contains("flowerFluid") && !flowerBlock.getFluidState().isEmpty()) { | |||
| } else if (nbt.contains("flowerFluid") && (!flowerBlock.getFluidState().isEmpty())) { | |||
There was a problem hiding this comment.
does that change anything?
There was a problem hiding this comment.
I as looking at supporting tanks placed in world as valid flowers, but realized it might be beyond the scope of this PR and deleted most of what I had, but looking at this, I did forget to delete this and only noticed it after pushing to github, I figured it was fine since it didn't change any behavior, however, I will revert it on my next push.
| if (nbt.contains("flowerFluid")) { | ||
| IFluidHandler flowerFluid = flowerItem.getCapability(Capabilities.FluidHandler.ITEM); | ||
| if (flowerFluid != null && flowerFluid.getFluidInTank(0).getAmount() >= ProductiveBeesConfig.BEES.minimumMbForFlowering.get()) { | ||
| return flowerFluid.getFluidInTank(0).is(BuiltInRegistries.FLUID.get(ResourceLocation.parse(nbt.getString("flowerFluid")))); |
There was a problem hiding this comment.
what about when "flowerFluid" is a tag
| @@ -561,6 +563,10 @@ public boolean isFlowerItem(ItemStack flowerItem) { | |||
| if (flowerItem.getItem() instanceof BlockItem blockItem && isFlowerBlock(blockItem.getBlock().defaultBlockState())) { | |||
| return true; | |||
| } | |||
| IFluidHandler flowerFluid = flowerItem.getCapability(Capabilities.FluidHandler.ITEM); | |||
| if (flowerFluid != null && flowerFluid.getFluidInTank(0).getAmount() >= ProductiveBeesConfig.BEES.minimumMbForFlowering.get()) { | |||
There was a problem hiding this comment.
there's only a check for the amount here, what about the fluid type?
There was a problem hiding this comment.
I was basing it mainly off the existing flower block system which uses the DEFAULT_FLOWERING_BLOCK tag, if I did it the same way, we would need to make a DEFAULT_FLOWERING_FLUID tag or have a way to grab the flowering fluid from within the ProductiveBee class. I think if you do want to check for the fluid here, adding the tags would be easier, but I'll work on doing it whichever way you want it done.
There was a problem hiding this comment.
I don't want a default flowering fluid, this here looks like it would enable any bee to flower off of a bucket of water.
There was a problem hiding this comment.
I thought that was checked for else where so I did a test. I'm not really sure how to do a proper test for this tbh, but I did 2 in game tests for half an hour each: both with 2 advanced hives and 4 Omega upgrades, 1 with a lava bucket in a feeding slab, 1 with a water bucket in a feeding slab. I put a water bee in both, and for the first test, just let it run, for the second test, I swapped the water bee to pollinate with lava to test it. Test 1, only the water hive filled with anything, test 2, only the lava hive filled with anything.
Add the ability for fluid tanks and buckets to work in a feeding slab for bees that need a fluid to pollinate