From a324df15768b81af948db4e0a23fe0c56b92524c Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Fri, 21 Apr 2023 14:55:05 +0800 Subject: [PATCH] 3.0.3-hotfix3 --- .../api/customplugin/PlatformManager.java | 26 +++++++++++-------- .../api/object/basic/MessageManager.java | 4 +++ .../customcrops/api/object/world/CCWorld.java | 2 +- .../subcmd/force/ConsumeTaskCommand.java | 1 + .../subcmd/force/SprinklerWorkCommand.java | 1 + .../resources/messages/messages_english.yml | 4 +-- 6 files changed, 24 insertions(+), 14 deletions(-) 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 b0f4adb..d1841fe 100644 --- a/src/main/java/net/momirealms/customcrops/api/customplugin/PlatformManager.java +++ b/src/main/java/net/momirealms/customcrops/api/customplugin/PlatformManager.java @@ -374,18 +374,22 @@ public class PlatformManager extends Function { } Sprinkler sprinkler = plugin.getWorldDataManager().getSprinklerData(SimpleLocation.getByBukkitLocation(location)); - if (sprinkler != null) { - WaterAmountHologram waterAmountHologram = sprinklerConfig.getSprinklerHologram(); - if (waterAmountHologram != null) { - String content = waterAmountHologram.getContent(sprinkler.getWater(), sprinklerConfig.getStorage()); - plugin.getHologramManager().showHologram(player, - location.clone().add(0.5, waterAmountHologram.getOffset(),0.5), - AdventureUtils.getComponentFromMiniMessage(content), - waterAmountHologram.getDuration() * 1000, - waterAmountHologram.getMode(), - waterAmountHologram.getTextDisplayMeta() - ); + + WaterAmountHologram waterAmountHologram = sprinklerConfig.getSprinklerHologram(); + if (waterAmountHologram != null) { + String content; + if (sprinkler != null) { + content = waterAmountHologram.getContent(sprinkler.getWater(), sprinklerConfig.getStorage()); + } else { + content = waterAmountHologram.getContent(0, sprinklerConfig.getStorage()); } + plugin.getHologramManager().showHologram(player, + location.clone().add(0.5, waterAmountHologram.getOffset(),0.5), + AdventureUtils.getComponentFromMiniMessage(content), + waterAmountHologram.getDuration() * 1000, + waterAmountHologram.getMode(), + waterAmountHologram.getTextDisplayMeta() + ); } return true; } diff --git a/src/main/java/net/momirealms/customcrops/api/object/basic/MessageManager.java b/src/main/java/net/momirealms/customcrops/api/object/basic/MessageManager.java index 9d93eb7..3dcef23 100644 --- a/src/main/java/net/momirealms/customcrops/api/object/basic/MessageManager.java +++ b/src/main/java/net/momirealms/customcrops/api/object/basic/MessageManager.java @@ -49,6 +49,8 @@ public class MessageManager extends Function { public static String setDate; public static String worldNotExist; public static String seasonNotExist; + public static String forceWork; + public static String forceConsume; public MessageManager(CustomCrops plugin) { this.plugin =plugin; @@ -81,5 +83,7 @@ public class MessageManager extends Function { setDate = config.getString("messages.set-date", "Successfully set {world}'s date to {date}."); worldNotExist = config.getString("messages.world-not-exist", "World {world} does not exist."); seasonNotExist = config.getString("messages.season-not-exist", "Season {season} does not exist."); + forceWork = config.getString("messages.force-sprinkler-work", "Forced {world}'s sprinklers to work."); + forceConsume = config.getString("messages.force-consume", "Forced {world}'s pots to reduce water amount and the remaining use of fertilizers."); } } diff --git a/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java b/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java index a2f28a9..a33f682 100644 --- a/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java +++ b/src/main/java/net/momirealms/customcrops/api/object/world/CCWorld.java @@ -195,7 +195,7 @@ public class CCWorld extends Function { scheduleConsumeTask(); } } - else if (time > 1970 && time < 2030 && lastWorkDay != day) { + else if (time > 970 && time < 1030 && lastWorkDay != day) { lastWorkDay = day; if (ConfigManager.enableScheduleSystem) { scheduleSprinklerWork(); diff --git a/src/main/java/net/momirealms/customcrops/command/subcmd/force/ConsumeTaskCommand.java b/src/main/java/net/momirealms/customcrops/command/subcmd/force/ConsumeTaskCommand.java index 5e3603a..7064ce6 100644 --- a/src/main/java/net/momirealms/customcrops/command/subcmd/force/ConsumeTaskCommand.java +++ b/src/main/java/net/momirealms/customcrops/command/subcmd/force/ConsumeTaskCommand.java @@ -46,6 +46,7 @@ public class ConsumeTaskCommand extends AbstractSubCommand { AdventureUtils.sendMessage(sender, MessageManager.prefix + MessageManager.worldNotExist.replace("{world}", args.get(0))); return true; } + AdventureUtils.sendMessage(sender, MessageManager.prefix + MessageManager.forceConsume.replace("{world}", args.get(0))); CustomCrops.getInstance().getScheduler().runTaskAsync(() -> { CCWorld ccworld = CustomCrops.getInstance().getWorldDataManager().getWorld(args.get(0)); if (ccworld != null) { diff --git a/src/main/java/net/momirealms/customcrops/command/subcmd/force/SprinklerWorkCommand.java b/src/main/java/net/momirealms/customcrops/command/subcmd/force/SprinklerWorkCommand.java index 9e4f40b..c55233d 100644 --- a/src/main/java/net/momirealms/customcrops/command/subcmd/force/SprinklerWorkCommand.java +++ b/src/main/java/net/momirealms/customcrops/command/subcmd/force/SprinklerWorkCommand.java @@ -46,6 +46,7 @@ public class SprinklerWorkCommand extends AbstractSubCommand { AdventureUtils.sendMessage(sender, MessageManager.prefix + MessageManager.worldNotExist.replace("{world}", args.get(0))); return true; } + AdventureUtils.sendMessage(sender, MessageManager.prefix + MessageManager.forceWork.replace("{world}", args.get(0))); CustomCrops.getInstance().getScheduler().runTaskAsync(() -> { CCWorld ccworld = CustomCrops.getInstance().getWorldDataManager().getWorld(args.get(0)); if (ccworld != null) { diff --git a/src/main/resources/messages/messages_english.yml b/src/main/resources/messages/messages_english.yml index bdf991b..34fde1f 100644 --- a/src/main/resources/messages/messages_english.yml +++ b/src/main/resources/messages/messages_english.yml @@ -20,5 +20,5 @@ messages: set-date: "Successfully set {world}'s date to {date}." world-not-exist: 'World {world} does not exist.' season-not-exist: 'Season {season} does not exist.' - force-sprinkler-work: "Forced {world}'s sprinklers to work" - force-consume: "Forced {world}'s pots to reduce water amount and the remaining use of fertilizers" \ No newline at end of file + force-sprinkler-work: "Forced {world}'s sprinklers to start working." + force-consume: "Forced {world}'s pots to reduce water amount and the remaining use of fertilizers." \ No newline at end of file