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

2.0.3

Browse Source
This commit is contained in:
Xiao-MoMi
2022-10-22 09:51:26 +08:00
parent cce61c98a5
commit 421dde11d1
17 changed files with 80 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -4,7 +4,7 @@ plugins {
}
group = 'net.momirealms'
version = '2.0.2'
version = '2.0.3'
repositories {
mavenCentral()

9
src/main/java/net/momirealms/customcrops/api/event/CropHarvestEvent.java
View File

@@ -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

10
src/main/java/net/momirealms/customcrops/api/event/CrowAttackEvent.java
View File

@@ -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;
}

9
src/main/java/net/momirealms/customcrops/api/event/CustomWorldEvent.java
View File

@@ -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;
}

9
src/main/java/net/momirealms/customcrops/api/event/FertilizerUseEvent.java
View File

@@ -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

10
src/main/java/net/momirealms/customcrops/api/event/SeedPlantEvent.java
View File

@@ -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;
}

9
src/main/java/net/momirealms/customcrops/api/event/SprinklerFillEvent.java
View File

@@ -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

9
src/main/java/net/momirealms/customcrops/api/event/SprinklerPlaceEvent.java
View File

@@ -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;
}

9
src/main/java/net/momirealms/customcrops/api/event/SurveyorUseEvent.java
View File

@@ -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;

9
src/main/java/net/momirealms/customcrops/api/event/WaterEvent.java
View File

@@ -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

9
src/main/java/net/momirealms/customcrops/api/event/WateringCanFillEvent.java
View File

@@ -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

2
src/main/java/net/momirealms/customcrops/commands/subcmd/SetSeasonCommand.java
View File

@@ -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;

2
src/main/java/net/momirealms/customcrops/integrations/customplugin/HandlerP.java
View File

@@ -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;

2
src/main/java/net/momirealms/customcrops/integrations/papi/SeasonPapi.java
View File

@@ -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;

9
src/main/java/net/momirealms/customcrops/managers/CropManager.java
View File

@@ -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);
}

6
src/main/java/net/momirealms/customcrops/managers/CustomWorld.java
View File

@@ -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;

2
src/main/java/net/momirealms/customcrops/managers/listener/PlayerContainerListener.java
View File

@@ -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();
}
}
}