Repo-Mirror/Custom-Crops
9
0
Fork 0
mirror of https://github.com/Xiao-MoMi/Custom-Crops.git synced 2025-12-27 19:09:09 +00:00
Code Issues Releases Activity

Fix interacting furniture

Browse Source
This commit is contained in:
XiaoMoMi
2024-11-12 17:35:18 +08:00
parent c0d9f46dbd
commit d020e2df8a
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/src/main/java/net/momirealms/customcrops/api/core/item/WateringCanItem.java
View File

@@ -331,6 +331,30 @@ public class WateringCanItem extends AbstractCustomCropsItem {
return InteractionResult.COMPLETE;
}
// check the clicked block/furniture
for (FillMethod method : wateringCanConfig.fillMethods()) {
if (method.getID().equals(targetBlockID)) {
if (method.checkRequirements(context)) {
if (waterInCan >= wateringCanConfig.storage()) {
ActionManager.trigger(context, wateringCanConfig.fullActions());
return InteractionResult.COMPLETE;
}
WateringCanFillEvent fillEvent = new WateringCanFillEvent(player, event.hand(), itemInHand, event.location(), wateringCanConfig, method);
if (EventUtils.fireAndCheckCancel(fillEvent))
return InteractionResult.COMPLETE;
int current = Math.min(waterInCan + method.amountOfWater(), wateringCanConfig.storage());
context.arg(ContextKeys.WATER_BAR, Optional.ofNullable(wateringCanConfig.waterBar()).map(bar -> bar.getWaterBar(current, wateringCanConfig.storage())).orElse(""));
context.arg(ContextKeys.STORAGE, wateringCanConfig.storage());
context.arg(ContextKeys.CURRENT_WATER, current);
setCurrentWater(itemInHand, wateringCanConfig, waterInCan + method.amountOfWater(), context);
method.triggerActions(context);
ActionManager.trigger(context, wateringCanConfig.addWaterActions());
}
return InteractionResult.COMPLETE;
}
}
// the clicked block might be a block underwater, so we do raytracing to get the water (nearest fluid)
RayTraceResult result = player.getWorld().rayTraceBlocks(player.getEyeLocation(), player.getLocation().getDirection(), 5, FluidCollisionMode.ALWAYS);
if (result == null)
return InteractionResult.COMPLETE;
@@ -366,7 +390,8 @@ public class WateringCanItem extends AbstractCustomCropsItem {
}
}
// give it another try
// give it the last try, this time we don't use blockstate
// instead we use Bukkit Material Enum Names
if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) {
blockID = "WATER";
} else {

6
api/src/main/java/net/momirealms/customcrops/api/core/world/WorldManager.java
View File

@@ -72,6 +72,12 @@ public interface WorldManager extends Reloadable {
*/
boolean unloadWorld(World world, boolean disabling);
/**
* Checks if mechanism is enabled for a certain world
*
* @param world world
* @return enabled or not
*/
boolean isMechanicEnabled(World world);
/**