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

Added an option to check the other hand

Browse Source
This commit is contained in:
XiaoMoMi
2024-09-05 02:38:06 +08:00
parent 660e1d26da
commit 3395de1d11
2 changed files with 36 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/main/java/net/momirealms/customcrops/api/core/AbstractCustomEventListener.java
View File

@@ -334,13 +334,20 @@ public abstract class AbstractCustomEventListener implements Listener {
} }
} }
@EventHandler @EventHandler(ignoreCancelled = true)
public void onBlockPhysics(BlockPhysicsEvent event) { public void onBlockPhysics(BlockPhysicsEvent event) {
if (ConfigManager.overriddenCrops().contains(event.getBlock().getType())) { if (ConfigManager.overriddenCrops().contains(event.getBlock().getType())) {
event.setCancelled(true); event.setCancelled(true);
} }
} }
@EventHandler(ignoreCancelled = true)
public void onBlockGrow(BlockGrowEvent event) {
if (ConfigManager.overriddenCrops().contains(event.getBlock().getType())) {
event.setCancelled(true);
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH) @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGH)
public void onDispenser(BlockDispenseEvent event) { public void onDispenser(BlockDispenseEvent event) {
Block block = event.getBlock(); Block block = event.getBlock();

20
plugin/src/main/java/net/momirealms/customcrops/bukkit/requirement/PlayerRequirementManager.java
View File

@@ -64,7 +64,19 @@ public class PlayerRequirementManager extends AbstractRequirementManager<Player>
private void registerItemInHandRequirement() { private void registerItemInHandRequirement() {
registerRequirement((args, actions, runActions) -> { registerRequirement((args, actions, runActions) -> {
if (args instanceof Section section) { if (args instanceof Section section) {
boolean mainOrOff = section.getString("hand","main").equalsIgnoreCase("main"); String hand = section.getString("hand","main");
int mode;
if (hand.equalsIgnoreCase("main")) {
mode = 1;
} else if (hand.equalsIgnoreCase("off")) {
mode = 2;
} else if (hand.equalsIgnoreCase("other")) {
mode = 3;
} else {
mode = 0;
plugin.getPluginLogger().warn("Invalid hand argument: " + hand + " which is expected to be main/off/other");
return Requirement.empty();
}
int amount = section.getInt("amount", 0); int amount = section.getInt("amount", 0);
List<String> items = ListUtils.toList(section.get("item")); List<String> items = ListUtils.toList(section.get("item"));
return context -> { return context -> {
@@ -73,10 +85,14 @@ public class PlayerRequirementManager extends AbstractRequirementManager<Player>
EquipmentSlot slot = context.arg(ContextKeys.SLOT); EquipmentSlot slot = context.arg(ContextKeys.SLOT);
ItemStack itemStack; ItemStack itemStack;
if (slot == null) { if (slot == null) {
itemStack = mainOrOff ? player.getInventory().getItemInMainHand() : player.getInventory().getItemInOffHand(); itemStack = mode == 1 ? player.getInventory().getItemInMainHand() : player.getInventory().getItemInOffHand();
} else {
if (mode == 3) {
itemStack = player.getInventory().getItem(slot == EquipmentSlot.HAND ? EquipmentSlot.OFF_HAND : EquipmentSlot.HAND);
} else { } else {
itemStack = player.getInventory().getItem(slot); itemStack = player.getInventory().getItem(slot);
} }
}
String id = plugin.getItemManager().id(itemStack); String id = plugin.getItemManager().id(itemStack);
if (items.contains(id) && itemStack.getAmount() >= amount) return true; if (items.contains(id) && itemStack.getAmount() >= amount) return true;
if (runActions) ActionManager.trigger(context, actions); if (runActions) ActionManager.trigger(context, actions);