diff --git a/build.gradle b/build.gradle index 471f7f5..0050f46 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '3.0.3' +version = '3.0.4' repositories { mavenCentral() @@ -31,9 +31,9 @@ dependencies { compileOnly ('me.clip:placeholderapi:2.11.3') compileOnly ('com.github.LoneDev6:api-itemsadder:3.4.1-r4') compileOnly ('io.lumine:Mythic-Dist:5.0.3-SNAPSHOT') - compileOnly ('com.willfp:EcoSkills:2.2.6') - compileOnly ('com.willfp:eco:6.53.1') - compileOnly ('com.willfp:EcoJobs:3.2.5') + compileOnly('com.willfp:EcoSkills:2.2.6') + compileOnly('com.willfp:eco:6.53.1') + compileOnly('com.willfp:EcoJobs:3.2.5') compileOnly('net.objecthunter:exp4j:0.4.8') compileOnly fileTree(dir:'libs',includes:['*.jar']) implementation ('net.kyori:adventure-api:4.13.1') diff --git a/src/main/java/net/momirealms/customcrops/api/customplugin/PlatformManager.java b/src/main/java/net/momirealms/customcrops/api/customplugin/PlatformManager.java index 97726f8..5c11690 100644 --- a/src/main/java/net/momirealms/customcrops/api/customplugin/PlatformManager.java +++ b/src/main/java/net/momirealms/customcrops/api/customplugin/PlatformManager.java @@ -17,6 +17,7 @@ package net.momirealms.customcrops.api.customplugin; +import dev.lone.itemsadder.api.Events.CustomBlockBreakEvent; import net.momirealms.customcrops.CustomCrops; import net.momirealms.customcrops.api.customplugin.itemsadder.ItemsAdderHandler; import net.momirealms.customcrops.api.customplugin.oraxen.OraxenHandler; @@ -52,6 +53,7 @@ import org.bukkit.block.BlockFace; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.player.PlayerInteractEvent; @@ -105,6 +107,11 @@ public class PlatformManager extends Function { onBreakSomething(player, block.getLocation(), id, event); } + public void onBreakChorus(Player player, Block block, String id, CustomBlockBreakEvent event) { + if (event.isCancelled()) return; + onBreakSomething(player, block.getLocation(), id, event); + } + public void onBreakNoteBlock(Player player, Block block, String id, Cancellable event) { if (event.isCancelled()) return; onBreakSomething(player, block.getLocation(), id, event); @@ -132,6 +139,7 @@ public class PlatformManager extends Function { public void onInteractBlock(PlayerInteractEvent event) { if (event.getHand() != EquipmentSlot.HAND) return; + if (event.useItemInHand() == Event.Result.DENY) return; if (event.getAction() == org.bukkit.event.block.Action.RIGHT_CLICK_AIR) { onInteractAir(event.getPlayer()); } else if (event.getAction() == org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK) { @@ -410,7 +418,7 @@ public class PlatformManager extends Function { AdventureUtils.playerSound(player, passiveFillMethod.getSound()); } if (passiveFillMethod.getParticle() != null) { - location.getWorld().spawnParticle(passiveFillMethod.getParticle(), location.clone().add(0.5,0.4, 0.5),5,0.3,0.1,0.3); + location.getWorld().spawnParticle(passiveFillMethod.getParticle(), location.clone().add(0.5,0.3, 0.5),5,0.3,0.1,0.3); } } @@ -483,7 +491,7 @@ public class PlatformManager extends Function { } event.setCancelled(true); - doPassiveFillAction(player, item_in_hand, passiveFillMethod, pot_loc); + doPassiveFillAction(player, item_in_hand, passiveFillMethod, location); potData.addWater(potWaterEvent.getWater()); return true; } @@ -648,7 +656,7 @@ public class PlatformManager extends Function { } event.setCancelled(true); - doPassiveFillAction(player, item_in_hand, passiveFillMethod, location); + doPassiveFillAction(player, item_in_hand, passiveFillMethod, location.clone().add(0,1,0)); plugin.getWorldDataManager().addWaterToPot(SimpleLocation.getByBukkitLocation(location), potWaterEvent.getWater(), pot_id); break outer; } diff --git a/src/main/java/net/momirealms/customcrops/api/customplugin/itemsadder/ItemsAdderHandler.java b/src/main/java/net/momirealms/customcrops/api/customplugin/itemsadder/ItemsAdderHandler.java index cf3516f..a00fc55 100644 --- a/src/main/java/net/momirealms/customcrops/api/customplugin/itemsadder/ItemsAdderHandler.java +++ b/src/main/java/net/momirealms/customcrops/api/customplugin/itemsadder/ItemsAdderHandler.java @@ -36,6 +36,7 @@ public class ItemsAdderHandler extends Handler { switch (block.getType()) { case NOTE_BLOCK -> platformManager.onBreakNoteBlock(event.getPlayer(), event.getBlock(), event.getNamespacedID(), event); case TRIPWIRE -> platformManager.onBreakTripWire(event.getPlayer(), event.getBlock(), event.getNamespacedID(), event); + case CHORUS_PLANT -> platformManager.onBreakChorus(event.getPlayer(), event.getBlock(), event.getNamespacedID(), event); } } diff --git a/src/main/java/net/momirealms/customcrops/command/subcmd/AboutCommand.java b/src/main/java/net/momirealms/customcrops/command/subcmd/AboutCommand.java index 9cef3ef..2565dec 100644 --- a/src/main/java/net/momirealms/customcrops/command/subcmd/AboutCommand.java +++ b/src/main/java/net/momirealms/customcrops/command/subcmd/AboutCommand.java @@ -37,7 +37,7 @@ public class AboutCommand extends AbstractSubCommand { AdventureUtils.sendMessage(sender, "<#FFA500>⛈ CustomCrops - <#F4A460>" + CustomCrops.getInstance().getVersionHelper().getPluginVersion()); AdventureUtils.sendMessage(sender, "<#FFFFE0>Custom crop system based on thread pool"); AdventureUtils.sendMessage(sender, "<#DA70D6>\uD83E\uDDEA Author: <#FFC0CB>XiaoMoMi"); - AdventureUtils.sendMessage(sender, "<#FF7F50>\uD83D\uDD25 Contributors: <#FFA07A>Cha_Shao, <#FFA07A>TopOrigin, <#FFA07A>AmazingCat, <#FFA07A>Iqtester"); + AdventureUtils.sendMessage(sender, "<#FF7F50>\uD83D\uDD25 Contributors: <#FFA07A>Cha_Shao, <#FFA07A>TopOrigin, <#FFA07A>AmazingCat"); AdventureUtils.sendMessage(sender, "<#FFD700>⭐ Document <#A9A9A9>| <#FAFAD2>⛏ Github <#A9A9A9>| <#48D1CC>\uD83D\uDD14 Polymart"); return true; } diff --git a/src/main/java/net/momirealms/customcrops/integration/job/EcoJobsImpl.java b/src/main/java/net/momirealms/customcrops/integration/job/EcoJobsImpl.java index b4dbac4..39119bd 100644 --- a/src/main/java/net/momirealms/customcrops/integration/job/EcoJobsImpl.java +++ b/src/main/java/net/momirealms/customcrops/integration/job/EcoJobsImpl.java @@ -19,6 +19,7 @@ package net.momirealms.customcrops.integration.job; import com.willfp.ecojobs.api.EcoJobsAPI; import com.willfp.ecojobs.jobs.Job; +import com.willfp.ecojobs.jobs.Jobs; import net.momirealms.customcrops.integration.JobInterface; import org.bukkit.entity.Player;