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

Improve debug messages

Browse Source
This commit is contained in:
XiaoMoMi
2024-09-05 17:15:15 +08:00
parent 417f91472a
commit 442760922a
2 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,13 +140,35 @@ public class WateringCanItem extends AbstractCustomCropsItem {
String blockID = BukkitCustomCropsPlugin.getInstance().getItemManager().blockID(targetBlock);
BukkitCustomCropsPlugin.getInstance().debug(blockID);
if (targetBlock.getType() == Material.WATER) {
blockID = "WATER";
}
if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) {
blockID = "WATER";
for (FillMethod method : config.fillMethods()) {
if (method.getID().equals(blockID)) {
if (method.checkRequirements(context)) {
if (water >= config.storage()) {
ActionManager.trigger(context, config.fullActions());
return;
}
WateringCanFillEvent fillEvent = new WateringCanFillEvent(player, event.hand(), itemInHand, targetBlock.getLocation(), config, method);
if (EventUtils.fireAndCheckCancel(fillEvent))
return;
int current = Math.min(water + method.amountOfWater(), config.storage());
context.arg(ContextKeys.WATER_BAR, Optional.ofNullable(config.waterBar()).map(bar -> bar.getWaterBar(current, config.storage())).orElse(""));
context.arg(ContextKeys.STORAGE, config.storage());
context.arg(ContextKeys.CURRENT_WATER, current);
setCurrentWater(itemInHand, config, water + method.amountOfWater(), context);
method.triggerActions(context);
ActionManager.trigger(context, config.addWaterActions());
}
return;
}
}
// give it another try
if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) {
blockID = "WATER";
} else {
blockID = targetBlock.getType().name();
}
for (FillMethod method : config.fillMethods()) {
if (method.getID().equals(blockID)) {
if (method.checkRequirements(context)) {
@@ -313,11 +335,34 @@ public class WateringCanItem extends AbstractCustomCropsItem {
context.arg(ContextKeys.LOCATION, new Location(player.getWorld(), vector.getX() - 0.5,vector.getY() - 1, vector.getZ() - 0.5));
String blockID = BukkitCustomCropsPlugin.getInstance().getItemManager().blockID(targetBlock);
BukkitCustomCropsPlugin.getInstance().debug(blockID);
if (targetBlock.getType() == Material.WATER) {
blockID = "WATER";
for (FillMethod method : wateringCanConfig.fillMethods()) {
if (method.getID().equals(blockID)) {
if (method.checkRequirements(context)) {
if (waterInCan >= wateringCanConfig.storage()) {
ActionManager.trigger(context, wateringCanConfig.fullActions());
return InteractionResult.COMPLETE;
}
WateringCanFillEvent fillEvent = new WateringCanFillEvent(player, event.hand(), itemInHand, targetBlock.getLocation(), 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;
}
}
// give it another try
if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) {
blockID = "WATER";
} else {
blockID = targetBlock.getType().name();
}
for (FillMethod method : wateringCanConfig.fillMethods()) {
if (method.getID().equals(blockID)) {

10
plugin/src/main/java/net/momirealms/customcrops/bukkit/command/feature/DebugDataCommand.java
View File

@@ -46,10 +46,12 @@ public class DebugDataCommand extends BukkitCommandFeature<CommandSender> {
.handler(context -> {
Player player = context.sender();
Location location;
Block block;
if (context.flags().hasFlag("this")) {
location = player.getLocation();
block = location.getBlock();
} else {
Block block = player.getTargetBlockExact(10);
block = player.getTargetBlockExact(10);
if (block == null) return;
location = block.getLocation();
}
@@ -57,12 +59,14 @@ public class DebugDataCommand extends BukkitCommandFeature<CommandSender> {
Optional<CustomCropsBlockState> state = world.getBlockState(Pos3.from(location));
if (state.isPresent()) {
BukkitCustomCropsPlugin.getInstance().getSenderFactory().wrap(player)
.sendMessage(AdventureHelper.miniMessage(state.get().toString()));
.sendMessage(AdventureHelper.miniMessage("<gold>" + state.get()));
} else {
BukkitCustomCropsPlugin.getInstance().getSenderFactory().wrap(player)
.sendMessage(AdventureHelper.miniMessage("Data not found"));
.sendMessage(AdventureHelper.miniMessage("<red>CustomCrops Data not found"));
}
});
BukkitCustomCropsPlugin.getInstance().getSenderFactory().wrap(player)
.sendMessage(AdventureHelper.miniMessage("<green>Vanilla crop data: " + block.getBlockData().getAsString()));
});
}