diff --git a/build.gradle b/build.gradle index 80fc1a87..abc7df44 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '1.3.1.2' +version = '1.3.1.3' repositories { maven {name = "aliyun-repo"; url = "https://maven.aliyun.com/repository/public/"} @@ -23,7 +23,6 @@ repositories { dependencies { compileOnly fileTree(dir:'libs',includes:['*.jar']) implementation fileTree(dir:'libs',includes:['BiomeAPI.jar']) - compileOnly('com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT') compileOnly('dev.folia:folia-api:1.19.4-R0.1-SNAPSHOT') compileOnly('com.zaxxer:HikariCP:5.0.1') compileOnly('com.github.Archy-X:AureliumSkills:Beta1.3.6') diff --git a/libs/AdvancedEnchantments-8.7.4.jar b/libs/AdvancedEnchantments-8.7.4.jar deleted file mode 100644 index a8d356b5..00000000 Binary files a/libs/AdvancedEnchantments-8.7.4.jar and /dev/null differ diff --git a/libs/BattlePass(premium).txt b/libs/BattlePass(premium).txt deleted file mode 100644 index 40d5c235..00000000 --- a/libs/BattlePass(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/1-8-1-19-3-%E2%AD%90-battlepass-%E2%AD%90-unlimited-practical-customizable-quests-%E2%9A%94%EF%B8%8F-30-sale.63076/ \ No newline at end of file diff --git a/libs/ClueScrolls(premium).txt b/libs/ClueScrolls(premium).txt deleted file mode 100644 index c4a6fbc1..00000000 --- a/libs/ClueScrolls(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/%E2%AD%90-cluescrolls-%E2%AD%90-%E2%95%91-1-8-to-1-19-250-clue-types-new-default-config-rewards.30276/ \ No newline at end of file diff --git a/libs/CustomCrops-2.0.5-all.jar b/libs/CustomCrops-2.0.5-all.jar deleted file mode 100644 index 3af61968..00000000 Binary files a/libs/CustomCrops-2.0.5-all.jar and /dev/null differ diff --git a/libs/CustomCrops-3.2.1-API.jar b/libs/CustomCrops-3.2.1-API.jar new file mode 100644 index 00000000..343bc1c3 Binary files /dev/null and b/libs/CustomCrops-3.2.1-API.jar differ diff --git a/libs/MMOCore(premium).txt b/libs/MMOCore(premium).txt deleted file mode 100644 index ecc7e8f7..00000000 --- a/libs/MMOCore(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/mmocore.70575/ \ No newline at end of file diff --git a/libs/MMOItems(premium).txt b/libs/MMOItems(premium).txt deleted file mode 100644 index f0f1ae1d..00000000 --- a/libs/MMOItems(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/mmoitems-premium.39267/ \ No newline at end of file diff --git a/libs/MythicLib-1.3.31.jar b/libs/MythicLib-1.3.31.jar deleted file mode 100644 index a0ce58f9..00000000 Binary files a/libs/MythicLib-1.3.31.jar and /dev/null differ diff --git a/libs/MythicLib-1.5.2.jar b/libs/MythicLib-1.5.2.jar new file mode 100644 index 00000000..98739445 Binary files /dev/null and b/libs/MythicLib-1.5.2.jar differ diff --git a/libs/RealisticSeasons(premium).txt b/libs/RealisticSeasons(premium).txt deleted file mode 100644 index 3cd2f5c0..00000000 --- a/libs/RealisticSeasons(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/realisticseasons-1-16-3-1-19-2-seasons-in-your-minecraft-world-with-temperature-and-calendar.93275/ \ No newline at end of file diff --git a/libs/mcMMO(premium).txt b/libs/mcMMO(premium).txt deleted file mode 100644 index d94417c7..00000000 --- a/libs/mcMMO(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/official-mcmmo-original-author-returns.64348/ \ No newline at end of file diff --git a/libs/oraxen(premium).txt b/libs/oraxen(premium).txt deleted file mode 100644 index d1c9fc67..00000000 --- a/libs/oraxen(premium).txt +++ /dev/null @@ -1 +0,0 @@ -https://www.spigotmc.org/resources/%E2%9C%85-10-%E2%98%84%EF%B8%8F-oraxen-add-items-blocks-armors-hats-food-furnitures-plants-and-sellFishGui.72448/ \ No newline at end of file diff --git a/libs/premiumlibs.txt b/libs/premiumlibs.txt new file mode 100644 index 00000000..bb9d5530 --- /dev/null +++ b/libs/premiumlibs.txt @@ -0,0 +1,11 @@ +You have to get these premium jars before building this project. + +AdvancedEnchantments-9.0.0b76 +battle-pass-3.13.7 +ClueScrolls-4.8.6 +EcoSkills v3.0.0-b2 +mcMMO +MMOCore-1.11.3 +MMOItems-6.9.3 +oraxen-1.155.0 +RealisticSeasons-10.4.3 \ No newline at end of file diff --git a/src/main/java/net/momirealms/customfishing/CustomFishing.java b/src/main/java/net/momirealms/customfishing/CustomFishing.java index 9857a08a..7b92c73b 100644 --- a/src/main/java/net/momirealms/customfishing/CustomFishing.java +++ b/src/main/java/net/momirealms/customfishing/CustomFishing.java @@ -202,6 +202,7 @@ public final class CustomFishing extends JavaPlugin { public void reload() { ConfigManager.load(); MessageManager.load(); + getScheduler().reload(); getDataManager().unload(); getDataManager().load(); getEffectManager().unload(); @@ -226,7 +227,6 @@ public final class CustomFishing extends JavaPlugin { getBagDataManager().load(); getStatisticsManager().unload(); getStatisticsManager().load(); - getScheduler().reload(); } public static BukkitAudiences getAdventure() { diff --git a/src/main/java/net/momirealms/customfishing/fishing/BobberCheckTask.java b/src/main/java/net/momirealms/customfishing/fishing/BobberCheckTask.java index 73cd5c00..63b748dc 100644 --- a/src/main/java/net/momirealms/customfishing/fishing/BobberCheckTask.java +++ b/src/main/java/net/momirealms/customfishing/fishing/BobberCheckTask.java @@ -42,26 +42,27 @@ import java.util.concurrent.TimeUnit; public class BobberCheckTask implements Runnable { - private final ScheduledFuture bobberTask; - private final FishHook fishHook; private final CustomFishing plugin; - private int timer; + + private final ScheduledFuture bobberTask; + private ScheduledFuture getHookedTask; + private ScheduledFuture resetTask; + private final FishHook fishHook; private final Player player; private final Effect effect; + private final String rod; + private final String bait; private final FishingManager fishingManager; private boolean hooked; private boolean reserve; - private int jump_timer; - private final int lureLevel; - private ScheduledFuture getHookedTask; - private ScheduledFuture resetTask; - private LavaEffect lavaEffect; - private ArmorStand hookedEntity; - private final int entityID; private boolean land; private boolean first; - private final String rod; - private final String bait; + private int timer; + private int jump_timer; + private final int entityID; + private final int lureLevel; + private LavaEffect lavaEffect; + private ArmorStand hookedEntity; public BobberCheckTask(CustomFishing plugin, Player player, Effect effect, FishHook fishHook, FishingManager fishingManager, int lureLevel, int entityID, String rod, String bait) { this.fishHook = fishHook; diff --git a/src/main/java/net/momirealms/customfishing/scheduler/Scheduler.java b/src/main/java/net/momirealms/customfishing/scheduler/Scheduler.java index a1175dd2..870a155f 100644 --- a/src/main/java/net/momirealms/customfishing/scheduler/Scheduler.java +++ b/src/main/java/net/momirealms/customfishing/scheduler/Scheduler.java @@ -43,7 +43,6 @@ public class Scheduler extends Function { } public void reload() { - this.schedule.getQueue().clear(); this.schedule.setCorePoolSize(ConfigManager.corePoolSize); this.schedule.setMaximumPoolSize(ConfigManager.maximumPoolSize); this.schedule.setKeepAliveTime(ConfigManager.keepAliveTime, TimeUnit.SECONDS);