From 420e0db54454ec41dc67eb24f17e768d3a47efa9 Mon Sep 17 00:00:00 2001
From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Fri, 23 Dec 2022 20:39:55 +0800
Subject: [PATCH] 1.2.15

---
 build.gradle                                                | 6 +++---
 .../customfishing/commands/subcmd/OpenBagCommand.java       | 2 --
 .../momirealms/customfishing/competition/Competition.java   | 2 +-
 .../customfishing/competition/CompetitionSchedule.java      | 2 +-
 .../customfishing/data/storage/SqlConnection.java           | 2 +-
 .../customfishing/integration/BlockInterface.java           | 2 --
 .../customfishing/integration/block/OraxenBlockImpl.java    | 1 -
 .../momirealms/customfishing/manager/BagDataManager.java    | 6 ------
 .../net/momirealms/customfishing/manager/ConfigManager.java | 5 +++++
 .../momirealms/customfishing/manager/FishingManager.java    | 1 -
 .../net/momirealms/customfishing/manager/SellManager.java   | 1 -
 .../customfishing/object/requirements/SeasonImpl.java       | 1 -
 .../net/momirealms/customfishing/util/ArmorStandUtil.java   | 1 -
 .../net/momirealms/customfishing/util/ItemStackUtil.java    | 3 +--
 src/main/resources/plugin.yml                               | 1 +
 15 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0f14e99c..977b014f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'net.momirealms'
-version = '1.2.13'
+version = '1.2.15'
 
 repositories {
     mavenCentral()
@@ -67,10 +67,10 @@ dependencies {
     compileOnly('net.objecthunter:exp4j:0.4.8')
     compileOnly('org.mariadb.jdbc:mariadb-java-client:3.0.6')
     implementation('net.kyori:adventure-api:4.12.0')
-    implementation('net.kyori:adventure-platform-bukkit:4.1.2')
+    implementation('net.kyori:adventure-platform-bukkit:4.2.0')
     implementation('net.kyori:adventure-text-minimessage:4.12.0')
     implementation('net.kyori:adventure-text-serializer-legacy:4.12.0')
-    implementation('de.tr7zw:item-nbt-api:2.10.0')
+    implementation('de.tr7zw:item-nbt-api:2.11.1')
     implementation("org.bstats:bstats-bukkit:3.0.0")
 }
 
diff --git a/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenBagCommand.java b/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenBagCommand.java
index f922d514..370197d3 100644
--- a/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenBagCommand.java
+++ b/src/main/java/net/momirealms/customfishing/commands/subcmd/OpenBagCommand.java
@@ -7,13 +7,11 @@ import net.momirealms.customfishing.manager.ConfigManager;
 import net.momirealms.customfishing.manager.MessageManager;
 import net.momirealms.customfishing.util.AdventureUtil;
 import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 public class OpenBagCommand extends AbstractSubCommand {
 
diff --git a/src/main/java/net/momirealms/customfishing/competition/Competition.java b/src/main/java/net/momirealms/customfishing/competition/Competition.java
index 7465b33c..0634776f 100644
--- a/src/main/java/net/momirealms/customfishing/competition/Competition.java
+++ b/src/main/java/net/momirealms/customfishing/competition/Competition.java
@@ -145,7 +145,7 @@ public class Competition {
 
         Bukkit.getScheduler().runTaskLaterAsynchronously(CustomFishing.plugin, ()-> {
             ranking.clear();
-        }, 100);
+        }, 600);
     }
 
     public void givePrize(){
diff --git a/src/main/java/net/momirealms/customfishing/competition/CompetitionSchedule.java b/src/main/java/net/momirealms/customfishing/competition/CompetitionSchedule.java
index ee7c0067..93da20f3 100644
--- a/src/main/java/net/momirealms/customfishing/competition/CompetitionSchedule.java
+++ b/src/main/java/net/momirealms/customfishing/competition/CompetitionSchedule.java
@@ -82,7 +82,7 @@ public class CompetitionSchedule extends Function {
                     }
                 }
             }
-        }.runTaskTimer(CustomFishing.plugin, (60 - LocalTime.now().getSecond()) * 20, 1200);
+        }.runTaskTimer(CustomFishing.plugin, 60 - LocalTime.now().getSecond(), 200);
     }
 
     public void stopCheck() {
diff --git a/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java b/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java
index 8b7f483c..3f2d348c 100644
--- a/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java
+++ b/src/main/java/net/momirealms/customfishing/data/storage/SqlConnection.java
@@ -53,7 +53,7 @@ public class SqlConnection {
         hikariConfig.setMaximumPoolSize(config.getInt(storageMode + ".Pool-Settings.maximum-pool-size"));
         hikariConfig.setMinimumIdle(config.getInt(storageMode + ".Pool-Settings.minimum-idle"));
         hikariConfig.setMaxLifetime(config.getInt(storageMode + ".Pool-Settings.maximum-lifetime"));
-        hikariConfig.setConnectionTimeout(5000);
+        hikariConfig.setConnectionTimeout(3000);
         for (String property : config.getConfigurationSection(storageMode + ".properties").getKeys(false)) {
             hikariConfig.addDataSourceProperty(property, config.getString(storageMode + ".properties." + property));
         }
diff --git a/src/main/java/net/momirealms/customfishing/integration/BlockInterface.java b/src/main/java/net/momirealms/customfishing/integration/BlockInterface.java
index 6ef1eb7c..c7f81d3f 100644
--- a/src/main/java/net/momirealms/customfishing/integration/BlockInterface.java
+++ b/src/main/java/net/momirealms/customfishing/integration/BlockInterface.java
@@ -17,8 +17,6 @@
 
 package net.momirealms.customfishing.integration;
 
-import net.momirealms.customfishing.manager.TotemManager;
-import net.momirealms.customfishing.util.AdventureUtil;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
diff --git a/src/main/java/net/momirealms/customfishing/integration/block/OraxenBlockImpl.java b/src/main/java/net/momirealms/customfishing/integration/block/OraxenBlockImpl.java
index 83da35de..f73bd9e5 100644
--- a/src/main/java/net/momirealms/customfishing/integration/block/OraxenBlockImpl.java
+++ b/src/main/java/net/momirealms/customfishing/integration/block/OraxenBlockImpl.java
@@ -17,7 +17,6 @@
 
 package net.momirealms.customfishing.integration.block;
 
-import dev.lone.itemsadder.api.CustomBlock;
 import io.th0rgal.oraxen.mechanics.provided.gameplay.noteblock.NoteBlockMechanic;
 import io.th0rgal.oraxen.mechanics.provided.gameplay.noteblock.NoteBlockMechanicFactory;
 import io.th0rgal.oraxen.mechanics.provided.gameplay.noteblock.NoteBlockMechanicListener;
diff --git a/src/main/java/net/momirealms/customfishing/manager/BagDataManager.java b/src/main/java/net/momirealms/customfishing/manager/BagDataManager.java
index 0ffd3cc4..191f104d 100644
--- a/src/main/java/net/momirealms/customfishing/manager/BagDataManager.java
+++ b/src/main/java/net/momirealms/customfishing/manager/BagDataManager.java
@@ -25,20 +25,14 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.momirealms.customfishing.CustomFishing;
 import net.momirealms.customfishing.data.PlayerBagData;
-import net.momirealms.customfishing.data.storage.DataStorageInterface;
-import net.momirealms.customfishing.data.storage.FileStorageImpl;
-import net.momirealms.customfishing.data.storage.MySQLStorageImpl;
 import net.momirealms.customfishing.listener.InventoryListener;
 import net.momirealms.customfishing.listener.SimpleListener;
 import net.momirealms.customfishing.listener.WindowPacketListener;
 import net.momirealms.customfishing.object.Function;
 import net.momirealms.customfishing.util.AdventureUtil;
-import net.momirealms.customfishing.util.ConfigUtil;
-import net.momirealms.customfishing.util.ItemStackUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.inventory.InventoryClickEvent;
diff --git a/src/main/java/net/momirealms/customfishing/manager/ConfigManager.java b/src/main/java/net/momirealms/customfishing/manager/ConfigManager.java
index d44fb21d..3ba9edbf 100644
--- a/src/main/java/net/momirealms/customfishing/manager/ConfigManager.java
+++ b/src/main/java/net/momirealms/customfishing/manager/ConfigManager.java
@@ -129,6 +129,11 @@ public class ConfigManager {
         failureFadeStay = config.getInt("titles.failure.fade.stay", 30) * 50;
         failureFadeOut = config.getInt("titles.failure.fade.out", 10) * 50;
 
+        if (successTitle.length == 0) successTitle = new String[]{""};
+        if (successSubTitle.length == 0) successSubTitle = new String[]{""};
+        if (failureTitle.length == 0) failureTitle = new String[]{""};
+        if (failureSubTitle.length == 0) failureSubTitle = new String[]{""};
+
         enableWaterAnimation = config.getBoolean("mechanics.splash-animation.water.enable", false);
         enableLavaAnimation = config.getBoolean("mechanics.splash-animation.lava.enable", false);
         water_item = config.getString("mechanics.splash-animation.water.item");
diff --git a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java
index c8eea8f5..0a112c8e 100644
--- a/src/main/java/net/momirealms/customfishing/manager/FishingManager.java
+++ b/src/main/java/net/momirealms/customfishing/manager/FishingManager.java
@@ -24,7 +24,6 @@ import net.kyori.adventure.sound.Sound;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
-import net.momirealms.customcrops.config.MainConfig;
 import net.momirealms.customfishing.CustomFishing;
 import net.momirealms.customfishing.api.event.*;
 import net.momirealms.customfishing.competition.Competition;
diff --git a/src/main/java/net/momirealms/customfishing/manager/SellManager.java b/src/main/java/net/momirealms/customfishing/manager/SellManager.java
index 1de10ca9..b83ecec0 100644
--- a/src/main/java/net/momirealms/customfishing/manager/SellManager.java
+++ b/src/main/java/net/momirealms/customfishing/manager/SellManager.java
@@ -28,7 +28,6 @@ import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.momirealms.customfishing.CustomFishing;
 import net.momirealms.customfishing.api.event.SellFishEvent;
-import net.momirealms.customfishing.data.PlayerBagData;
 import net.momirealms.customfishing.data.PlayerSellData;
 import net.momirealms.customfishing.integration.papi.PlaceholderManager;
 import net.momirealms.customfishing.listener.InventoryListener;
diff --git a/src/main/java/net/momirealms/customfishing/object/requirements/SeasonImpl.java b/src/main/java/net/momirealms/customfishing/object/requirements/SeasonImpl.java
index f3c07e08..b336b80d 100644
--- a/src/main/java/net/momirealms/customfishing/object/requirements/SeasonImpl.java
+++ b/src/main/java/net/momirealms/customfishing/object/requirements/SeasonImpl.java
@@ -18,7 +18,6 @@
 package net.momirealms.customfishing.object.requirements;
 
 import net.momirealms.customfishing.CustomFishing;
-import net.momirealms.customfishing.helper.Log;
 import net.momirealms.customfishing.integration.SeasonInterface;
 import net.momirealms.customfishing.object.fishing.FishingCondition;
 
diff --git a/src/main/java/net/momirealms/customfishing/util/ArmorStandUtil.java b/src/main/java/net/momirealms/customfishing/util/ArmorStandUtil.java
index 55557de2..d1dfa672 100644
--- a/src/main/java/net/momirealms/customfishing/util/ArmorStandUtil.java
+++ b/src/main/java/net/momirealms/customfishing/util/ArmorStandUtil.java
@@ -43,7 +43,6 @@ public class ArmorStandUtil {
         destroyPacket.getIntLists().write(0, List.of(id));
         return destroyPacket;
     }
-
     public static PacketContainer getSpawnPacket(int id, Location location) {
         PacketContainer entityPacket = new PacketContainer(PacketType.Play.Server.SPAWN_ENTITY);
         entityPacket.getModifier().write(0, id);
diff --git a/src/main/java/net/momirealms/customfishing/util/ItemStackUtil.java b/src/main/java/net/momirealms/customfishing/util/ItemStackUtil.java
index 1b52efbf..c4e956e6 100644
--- a/src/main/java/net/momirealms/customfishing/util/ItemStackUtil.java
+++ b/src/main/java/net/momirealms/customfishing/util/ItemStackUtil.java
@@ -273,11 +273,10 @@ public class ItemStackUtil {
                 }
                 case NBTTagList -> {
                     List<Object> list = new ArrayList<>();
-                    switch (nbtCompound.getListType(key)){
+                    switch (nbtCompound.getListType(key)) {
                         case NBTTagInt -> nbtCompound.getIntegerList(key).forEach(a -> list.add("(Int) " + a));
                         case NBTTagDouble -> nbtCompound.getDoubleList(key).forEach(a -> list.add("(Double) " + a));
                         case NBTTagString -> nbtCompound.getStringList(key).forEach(a -> list.add("(String) " + a));
-                        case NBTTagCompound -> nbtCompound.getCompoundList(key).forEach(a -> list.add(compoundToMap(a)));
                         case NBTTagFloat -> nbtCompound.getFloatList(key).forEach(a -> list.add("(Float) " + a));
                         case NBTTagLong -> nbtCompound.getLongList(key).forEach(a -> list.add("(Long) " + a));
                         case NBTTagIntArray -> nbtCompound.getIntArrayList(key).forEach(a -> list.add("(IntArray) " + Arrays.toString(a)));
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 2709257b..3c59e225 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -30,6 +30,7 @@ softdepend:
   - MMOItems
   - eco
   - Vault
+  - BattlePass
 
 commands:
   customfishing: