diff --git a/build.gradle b/build.gradle index 16cfbf2..9525a73 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '2.0.2' +version = '2.0.3' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customcrops/api/event/CropHarvestEvent.java b/src/main/java/net/momirealms/customcrops/api/event/CropHarvestEvent.java index 1034397..5030576 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/CropHarvestEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/CropHarvestEvent.java @@ -53,11 +53,16 @@ public class CropHarvestEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + /** * Get the crop player is harvesting * @return crop diff --git a/src/main/java/net/momirealms/customcrops/api/event/CrowAttackEvent.java b/src/main/java/net/momirealms/customcrops/api/event/CrowAttackEvent.java index e191ffc..7138aab 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/CrowAttackEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/CrowAttackEvent.java @@ -18,7 +18,6 @@ package net.momirealms.customcrops.api.event; import org.bukkit.Location; -import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; @@ -32,11 +31,16 @@ public class CrowAttackEvent extends Event { this.location = location; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public Location getLocation() { return location; } diff --git a/src/main/java/net/momirealms/customcrops/api/event/CustomWorldEvent.java b/src/main/java/net/momirealms/customcrops/api/event/CustomWorldEvent.java index 470f8b4..8f24d76 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/CustomWorldEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/CustomWorldEvent.java @@ -34,11 +34,16 @@ public class CustomWorldEvent extends WorldEvent { this.state = worldState; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public WorldState getState() { return state; } diff --git a/src/main/java/net/momirealms/customcrops/api/event/FertilizerUseEvent.java b/src/main/java/net/momirealms/customcrops/api/event/FertilizerUseEvent.java index 9c9ce79..09ebb42 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/FertilizerUseEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/FertilizerUseEvent.java @@ -49,11 +49,16 @@ public class FertilizerUseEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + /** * Get the fertilizer player is using * @return fertilizer diff --git a/src/main/java/net/momirealms/customcrops/api/event/SeedPlantEvent.java b/src/main/java/net/momirealms/customcrops/api/event/SeedPlantEvent.java index e2ca86d..3d0db6f 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/SeedPlantEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/SeedPlantEvent.java @@ -24,7 +24,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import org.bukkit.event.player.PlayerEvent; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -53,11 +52,16 @@ public class SeedPlantEvent extends Event implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public Location getSeedLoc() { return seedLoc; } diff --git a/src/main/java/net/momirealms/customcrops/api/event/SprinklerFillEvent.java b/src/main/java/net/momirealms/customcrops/api/event/SprinklerFillEvent.java index 3382cf5..b11f8ac 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/SprinklerFillEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/SprinklerFillEvent.java @@ -46,11 +46,16 @@ public class SprinklerFillEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + /** * Get the itemStack player used to add water * @return itemStack diff --git a/src/main/java/net/momirealms/customcrops/api/event/SprinklerPlaceEvent.java b/src/main/java/net/momirealms/customcrops/api/event/SprinklerPlaceEvent.java index af42692..8c6f8b7 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/SprinklerPlaceEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/SprinklerPlaceEvent.java @@ -47,11 +47,16 @@ public class SprinklerPlaceEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + public Location getLocation() { return location; } diff --git a/src/main/java/net/momirealms/customcrops/api/event/SurveyorUseEvent.java b/src/main/java/net/momirealms/customcrops/api/event/SurveyorUseEvent.java index 89da1c9..2259042 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/SurveyorUseEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/SurveyorUseEvent.java @@ -51,11 +51,16 @@ public class SurveyorUseEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + @Nullable public Fertilizer getFertilizer() { return fertilizer; diff --git a/src/main/java/net/momirealms/customcrops/api/event/WaterEvent.java b/src/main/java/net/momirealms/customcrops/api/event/WaterEvent.java index 67a30b5..fc058da 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/WaterEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/WaterEvent.java @@ -46,11 +46,16 @@ public class WaterEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + /** * Get the item player use * @return itemStack diff --git a/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java b/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java index 4b12a39..77f3b18 100644 --- a/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java +++ b/src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java @@ -46,11 +46,16 @@ public class WateringCanFillEvent extends PlayerEvent implements Cancellable { this.cancelled = cancel; } - @Override - public @NotNull HandlerList getHandlers() { + public static HandlerList getHandlerList() { return handlers; } + @NotNull + @Override + public HandlerList getHandlers() { + return getHandlerList(); + } + /** * Get the item player use * @return itemStack diff --git a/src/main/java/net/momirealms/customcrops/commands/subcmd/SetSeasonCommand.java b/src/main/java/net/momirealms/customcrops/commands/subcmd/SetSeasonCommand.java index c8fdb47..711ed83 100644 --- a/src/main/java/net/momirealms/customcrops/commands/subcmd/SetSeasonCommand.java +++ b/src/main/java/net/momirealms/customcrops/commands/subcmd/SetSeasonCommand.java @@ -17,12 +17,12 @@ package net.momirealms.customcrops.commands.subcmd; +import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.api.utils.SeasonUtils; import net.momirealms.customcrops.commands.AbstractSubCommand; import net.momirealms.customcrops.commands.SubCommand; import net.momirealms.customcrops.config.MessageConfig; import net.momirealms.customcrops.config.SeasonConfig; -import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.utils.AdventureUtil; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/src/main/java/net/momirealms/customcrops/integrations/customplugin/HandlerP.java b/src/main/java/net/momirealms/customcrops/integrations/customplugin/HandlerP.java index 0311d50..70dd424 100644 --- a/src/main/java/net/momirealms/customcrops/integrations/customplugin/HandlerP.java +++ b/src/main/java/net/momirealms/customcrops/integrations/customplugin/HandlerP.java @@ -24,9 +24,9 @@ import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.momirealms.customcrops.CustomCrops; import net.momirealms.customcrops.api.crop.Crop; import net.momirealms.customcrops.api.event.*; +import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.api.utils.SeasonUtils; import net.momirealms.customcrops.config.*; -import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.managers.CropManager; import net.momirealms.customcrops.managers.CustomWorld; import net.momirealms.customcrops.managers.listener.InteractListener; diff --git a/src/main/java/net/momirealms/customcrops/integrations/papi/SeasonPapi.java b/src/main/java/net/momirealms/customcrops/integrations/papi/SeasonPapi.java index 95bba52..1d1a03b 100644 --- a/src/main/java/net/momirealms/customcrops/integrations/papi/SeasonPapi.java +++ b/src/main/java/net/momirealms/customcrops/integrations/papi/SeasonPapi.java @@ -18,11 +18,11 @@ package net.momirealms.customcrops.integrations.papi; import me.clip.placeholderapi.expansion.PlaceholderExpansion; +import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.api.utils.SeasonUtils; import net.momirealms.customcrops.config.MainConfig; import net.momirealms.customcrops.config.MessageConfig; import net.momirealms.customcrops.config.SeasonConfig; -import net.momirealms.customcrops.api.utils.CCSeason; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/src/main/java/net/momirealms/customcrops/managers/CropManager.java b/src/main/java/net/momirealms/customcrops/managers/CropManager.java index e2564e6..a12c812 100644 --- a/src/main/java/net/momirealms/customcrops/managers/CropManager.java +++ b/src/main/java/net/momirealms/customcrops/managers/CropManager.java @@ -21,6 +21,7 @@ import net.momirealms.customcrops.CustomCrops; import net.momirealms.customcrops.api.crop.Crop; import net.momirealms.customcrops.api.event.CropHarvestEvent; import net.momirealms.customcrops.api.event.CrowAttackEvent; +import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.config.BasicItemConfig; import net.momirealms.customcrops.config.MainConfig; import net.momirealms.customcrops.config.SeasonConfig; @@ -29,7 +30,6 @@ import net.momirealms.customcrops.integrations.customplugin.CustomInterface; import net.momirealms.customcrops.integrations.customplugin.HandlerP; import net.momirealms.customcrops.integrations.customplugin.itemsadder.*; import net.momirealms.customcrops.integrations.customplugin.oraxen.*; -import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.integrations.season.InternalSeason; import net.momirealms.customcrops.integrations.season.RealisticSeasonsHook; import net.momirealms.customcrops.integrations.season.SeasonInterface; @@ -71,7 +71,6 @@ public class CropManager extends Function { private ArmorStandUtil armorStandUtil; private ContainerListener containerListener; private PlayerModeListener playerModeListener; - private PlayerContainerListener playerContainerListener; private VanillaCropPlaceListener vanillaCropPlaceListener; private VanillaCropHarvestListener vanillaCropHarvestListener; private HandlerP handler; @@ -190,15 +189,9 @@ public class CropManager extends Function { HandlerList.unregisterAll(playerModeListener); this.playerModeListener = null; } - if (this.playerContainerListener != null) { - CustomCrops.protocolManager.removePacketListener(playerContainerListener); - this.playerContainerListener = null; - } if (!MainConfig.enableWaterCanLore || !MainConfig.enablePacketLore) return; containerListener = new ContainerListener(this); CustomCrops.protocolManager.addPacketListener(containerListener); - playerContainerListener = new PlayerContainerListener(handler); - CustomCrops.protocolManager.addPacketListener(playerContainerListener); playerModeListener = new PlayerModeListener(); Bukkit.getPluginManager().registerEvents(playerModeListener, CustomCrops.plugin); } diff --git a/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java b/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java index 2ff2d93..ff4ac7d 100644 --- a/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java +++ b/src/main/java/net/momirealms/customcrops/managers/CustomWorld.java @@ -20,9 +20,9 @@ package net.momirealms.customcrops.managers; import com.google.gson.*; import net.momirealms.customcrops.CustomCrops; import net.momirealms.customcrops.api.event.CustomWorldEvent; +import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.api.utils.SeasonUtils; import net.momirealms.customcrops.config.*; -import net.momirealms.customcrops.api.utils.CCSeason; import net.momirealms.customcrops.objects.SimpleLocation; import net.momirealms.customcrops.objects.Sprinkler; import net.momirealms.customcrops.objects.WorldState; @@ -443,7 +443,9 @@ public class CustomWorld { * @param location sprinkler location */ public void sprinklerWork(SimpleLocation location, Sprinkler sprinkler) { - if (sprinkler.getWater() <= 0) return; + if (sprinkler.getWater() <= 1) { + sprinklerCache.remove(location); + } Location sprinklerLoc = MiscUtils.getLocation(location); if (sprinklerLoc == null) return; diff --git a/src/main/java/net/momirealms/customcrops/managers/listener/PlayerContainerListener.java b/src/main/java/net/momirealms/customcrops/managers/listener/PlayerContainerListener.java index a1e0001..8a7c570 100644 --- a/src/main/java/net/momirealms/customcrops/managers/listener/PlayerContainerListener.java +++ b/src/main/java/net/momirealms/customcrops/managers/listener/PlayerContainerListener.java @@ -20,7 +20,7 @@ public class PlayerContainerListener extends PacketAdapter { public void onPacketReceiving(PacketEvent event) { final Player player = event.getPlayer(); if (handlerP.coolDownJudge(player)) { - player.updateInventory(); +// player.updateInventory(); } } } \ No newline at end of file