From a6d97160c46fe39a8a0f8e987af08f4be3e817c7 Mon Sep 17 00:00:00 2001 From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Tue, 28 Feb 2023 18:23:02 +0800 Subject: [PATCH] 1.2.23.2 --- build.gradle | 2 +- .../customfishing/competition/CompetitionConfig.java | 8 +------- .../competition/ranking/RedisRankingImpl.java | 2 +- .../integration/item/MythicMobsItemImpl.java | 9 ++++----- .../customfishing/integration/skill/MMOCoreImpl.java | 4 ++-- .../customfishing/manager/IntegrationManager.java | 2 +- .../customfishing/manager/SellManager.java | 2 ++ src/main/resources/competition.yml | 12 ++++++------ src/main/resources/config.yml | 6 ++++-- 9 files changed, 22 insertions(+), 25 deletions(-) diff --git a/build.gradle b/build.gradle index 7e7c413d..5cc96776 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.2.23' +version = '1.2.23.2' repositories { mavenCentral() diff --git a/src/main/java/net/momirealms/customfishing/competition/CompetitionConfig.java b/src/main/java/net/momirealms/customfishing/competition/CompetitionConfig.java index 9d804c98..94061cdb 100644 --- a/src/main/java/net/momirealms/customfishing/competition/CompetitionConfig.java +++ b/src/main/java/net/momirealms/customfishing/competition/CompetitionConfig.java @@ -106,10 +106,6 @@ public class CompetitionConfig { this.weekday = weekday; } - public static void main(String[] args) { - System.out.println(Calendar.getInstance().get(Calendar.DAY_OF_WEEK)); - } - public boolean canStart() { if (date != null && date.size() != 0) { Calendar calendar = Calendar.getInstance(); @@ -121,9 +117,7 @@ public class CompetitionConfig { if (weekday != null && weekday.size() != 0) { Calendar calendar = Calendar.getInstance(); int dateDay = calendar.get(Calendar.DAY_OF_WEEK); - if (!weekday.contains(dateDay)) { - return false; - } + return weekday.contains(dateDay); } return true; } diff --git a/src/main/java/net/momirealms/customfishing/competition/ranking/RedisRankingImpl.java b/src/main/java/net/momirealms/customfishing/competition/ranking/RedisRankingImpl.java index 3cbdd112..b989fdeb 100644 --- a/src/main/java/net/momirealms/customfishing/competition/ranking/RedisRankingImpl.java +++ b/src/main/java/net/momirealms/customfishing/competition/ranking/RedisRankingImpl.java @@ -39,7 +39,7 @@ public class RedisRankingImpl implements RankingInterface { Jedis jedis = JedisUtil.getJedis(); Double score = jedis.zscore("cf_competition", player); jedis.close(); - if (score == 0) return null; + if (score == null || score == 0) return null; return new CompetitionPlayer(player, Float.parseFloat(score.toString())); } diff --git a/src/main/java/net/momirealms/customfishing/integration/item/MythicMobsItemImpl.java b/src/main/java/net/momirealms/customfishing/integration/item/MythicMobsItemImpl.java index aaaeaae8..01d09b6a 100644 --- a/src/main/java/net/momirealms/customfishing/integration/item/MythicMobsItemImpl.java +++ b/src/main/java/net/momirealms/customfishing/integration/item/MythicMobsItemImpl.java @@ -26,17 +26,16 @@ import org.jetbrains.annotations.Nullable; public class MythicMobsItemImpl implements ItemInterface { - private final ItemExecutor itemManager; - - public MythicMobsItemImpl() { - this.itemManager = MythicBukkit.inst().getItemManager(); - } + private ItemExecutor itemManager; @Override @Nullable public ItemStack build(String material) { if (!material.startsWith("MythicMobs:")) return null; material = material.substring(11); + if (itemManager == null) { + this.itemManager = MythicBukkit.inst().getItemManager(); + } return itemManager.getItemStack(material); } diff --git a/src/main/java/net/momirealms/customfishing/integration/skill/MMOCoreImpl.java b/src/main/java/net/momirealms/customfishing/integration/skill/MMOCoreImpl.java index eb293242..3e7dfaf4 100644 --- a/src/main/java/net/momirealms/customfishing/integration/skill/MMOCoreImpl.java +++ b/src/main/java/net/momirealms/customfishing/integration/skill/MMOCoreImpl.java @@ -29,8 +29,8 @@ public class MMOCoreImpl implements SkillInterface { private final Profession profession; private final PlayerDataManager playerDataManager; - public MMOCoreImpl() { - profession = MMOCore.plugin.professionManager.get("fishing"); + public MMOCoreImpl(String name) { + profession = MMOCore.plugin.professionManager.get(name); playerDataManager = MMOCore.plugin.dataProvider.getDataManager(); } diff --git a/src/main/java/net/momirealms/customfishing/manager/IntegrationManager.java b/src/main/java/net/momirealms/customfishing/manager/IntegrationManager.java index 72f0beaf..dc2fa347 100644 --- a/src/main/java/net/momirealms/customfishing/manager/IntegrationManager.java +++ b/src/main/java/net/momirealms/customfishing/manager/IntegrationManager.java @@ -124,7 +124,7 @@ public class IntegrationManager extends Function { this.skillInterface = new mcMMOImpl(); hookMessage("mcMMO"); } else if (config.getBoolean("integrations.MMOCore", false) && Bukkit.getPluginManager().getPlugin("MMOCore") != null) { - this.skillInterface = new MMOCoreImpl(); + this.skillInterface = new MMOCoreImpl(config.getString("other-settings.MMOCore-profession-name", "fishing")); hookMessage("MMOCore"); } else if (config.getBoolean("integrations.AureliumSkills", false) && Bukkit.getPluginManager().getPlugin("AureliumSkills") != null) { this.skillInterface = new AureliumsImpl(); diff --git a/src/main/java/net/momirealms/customfishing/manager/SellManager.java b/src/main/java/net/momirealms/customfishing/manager/SellManager.java index 40fd0653..c94644ab 100644 --- a/src/main/java/net/momirealms/customfishing/manager/SellManager.java +++ b/src/main/java/net/momirealms/customfishing/manager/SellManager.java @@ -22,6 +22,8 @@ import com.comphenix.protocol.reflect.StructureModifier; import com.comphenix.protocol.wrappers.WrappedChatComponent; import de.tr7zw.changeme.nbtapi.NBTCompound; import de.tr7zw.changeme.nbtapi.NBTItem; +import net.Indyuce.mmoitems.MMOItems; +import net.Indyuce.mmoitems.api.item.mmoitem.MMOItem; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; import net.kyori.adventure.text.minimessage.MiniMessage; diff --git a/src/main/resources/competition.yml b/src/main/resources/competition.yml index a1ec0760..26deb869 100644 --- a/src/main/resources/competition.yml +++ b/src/main/resources/competition.yml @@ -7,22 +7,22 @@ example: # RANDOM goal: CATCH_AMOUNT - #Optional - #start-weekday: + # Optional + # start-weekday: # - monday # - sunday - #Optional - #start-date: + # Optional + # start-date: # - 1 # - 7 # - 14 - # optional + # Optional # Fishing competition can also be started with a command start-time: - '12:30' - '18:30' - #seconds + # Seconds duration: 300 # Min players to start the competition diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 49e90dc1..9f0a88d7 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,5 +1,5 @@ # don't change -config-version: '14' +config-version: '15' # chinese/english/spanish lang: english @@ -177,4 +177,6 @@ other-settings: prevent-other-players-pick-up-loot: false # Log the money player get from selling the fish in the console # 后台记录玩家销售鱼类所得金额 - log-earnings: true \ No newline at end of file + log-earnings: true + # Set the MMOCore profession name + MMOCore-profession-name: 'customfishing' \ No newline at end of file