From 4a9e96429ab11ac7dd6fda56c433222b4721ee75 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Mon, 18 Sep 2023 20:47:39 +0800 Subject: [PATCH] update libs --- .../api/data/LegacyDataStorageInterface.java | 17 +++++++++++++++++ .../api/event/FishHookLandEvent.java | 17 +++++++++++++++++ .../api/mechanic/GlobalSettings.java | 17 +++++++++++++++++ .../api/mechanic/effect/EffectCarrier.java | 17 +++++++++++++++++ .../api/mechanic/effect/EffectModifier.java | 17 +++++++++++++++++ .../api/mechanic/game/BasicGameConfig.java | 17 +++++++++++++++++ .../api/mechanic/loot/CFLoot.java | 17 +++++++++++++++++ plugin/build.gradle.kts | 19 ++++++++----------- .../command/sub/DataCommand.java | 17 +++++++++++++++++ .../command/sub/DebugCommand.java | 17 +++++++++++++++++ .../command/sub/StatisticsCommand.java | 17 +++++++++++++++++ .../compatibility/IntegrationManagerImpl.java | 1 - .../totem/block/property/HalfImpl.java | 17 +++++++++++++++++ .../util/CompletableFutures.java | 17 +++++++++++++++++ .../customfishing/util/ItemUtils.java | 17 +++++++++++++++++ 15 files changed, 229 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/net/momirealms/customfishing/api/data/LegacyDataStorageInterface.java b/api/src/main/java/net/momirealms/customfishing/api/data/LegacyDataStorageInterface.java index 99e4b982..0de7b499 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/data/LegacyDataStorageInterface.java +++ b/api/src/main/java/net/momirealms/customfishing/api/data/LegacyDataStorageInterface.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.data; import java.util.Optional; diff --git a/api/src/main/java/net/momirealms/customfishing/api/event/FishHookLandEvent.java b/api/src/main/java/net/momirealms/customfishing/api/event/FishHookLandEvent.java index aa72f14a..489b1bc6 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/event/FishHookLandEvent.java +++ b/api/src/main/java/net/momirealms/customfishing/api/event/FishHookLandEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.event; import org.bukkit.entity.Player; diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java index debdb241..a4fa6426 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/GlobalSettings.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.mechanic; import net.momirealms.customfishing.api.CustomFishingPlugin; diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java index a5cc1d9c..05df54f7 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectCarrier.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.mechanic.effect; import net.momirealms.customfishing.api.common.Key; diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java index bd3f463f..6df659cf 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/effect/EffectModifier.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.mechanic.effect; import net.momirealms.customfishing.api.mechanic.condition.Condition; diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java index 1f766731..01a4df5d 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/game/BasicGameConfig.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.mechanic.game; import net.momirealms.customfishing.api.mechanic.effect.Effect; diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java index 77b0ff5b..b6b56b02 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/loot/CFLoot.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.api.mechanic.loot; import net.momirealms.customfishing.api.mechanic.action.Action; diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index fe19fd56..8f528ea3 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -6,11 +6,10 @@ dependencies { compileOnly("dev.jorel:commandapi-bukkit-core:9.1.0") // packet - compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0") + compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0") // papi compileOnly("me.clip:placeholderapi:2.11.3") - compileOnly("io.github.miniplaceholders:miniplaceholders-api:2.1.0") // config compileOnly("dev.dejvokep:boosted-yaml:1.3.1") @@ -25,10 +24,10 @@ dependencies { compileOnly("com.google.code.gson:gson:2.10.1") // eco - compileOnly("com.willfp:eco:6.65.4") - compileOnly("com.willfp:EcoJobs:3.29.1") - compileOnly("com.willfp:EcoSkills:3.17.1") - compileOnly("com.willfp:libreforge:4.29.1") + compileOnly("com.willfp:eco:6.65.5") + compileOnly("com.willfp:EcoJobs:3.32.3") + compileOnly("com.willfp:EcoSkills:3.21.0") + compileOnly("com.willfp:libreforge:4.34.0") // database compileOnly("org.xerial:sqlite-jdbc:3.42.0.0") @@ -38,9 +37,9 @@ dependencies { compileOnly("redis.clients:jedis:4.4.3") // others - compileOnly("com.github.LoneDev6:api-itemsadder:3.5.0b") - compileOnly("com.github.oraxen:oraxen:1.159.0") - compileOnly("pers.neige.neigeitems:NeigeItems:1.15.9") + compileOnly("com.github.LoneDev6:api-itemsadder:3.5.0c-r5") + compileOnly("com.github.oraxen:oraxen:1.161.0") + compileOnly("pers.neige.neigeitems:NeigeItems:1.15.24") compileOnly("com.github.Zrips:Jobs:4.17.2") compileOnly("com.github.Archy-X:AureliumSkills:Beta1.3.21") compileOnly("com.github.MilkBowl:VaultAPI:1.7") @@ -72,7 +71,6 @@ dependencies { // local lib implementation(files("libs/BiomeAPI.jar")) - implementation(files("libs/ProtectionLib.jar")) // anvil implementation("net.wesjd:anvilgui:1.7.0-SNAPSHOT") @@ -86,6 +84,5 @@ tasks { relocate ("net.wesjd", "net.momirealms.customfishing.libraries") relocate ("org.bstats", "net.momirealms.customfishing.libraries.bstats") relocate ("net.momirealms.biomeapi", "net.momirealms.customfishing.libraries.biomeapi") - relocate ("net.momirealms.protectionlib", "net.momirealms.customfishing.libraries.protectionlib") } } diff --git a/plugin/src/main/java/net/momirealms/customfishing/command/sub/DataCommand.java b/plugin/src/main/java/net/momirealms/customfishing/command/sub/DataCommand.java index 50c59cba..ca34773a 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/command/sub/DataCommand.java +++ b/plugin/src/main/java/net/momirealms/customfishing/command/sub/DataCommand.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.command.sub; import com.google.gson.GsonBuilder; diff --git a/plugin/src/main/java/net/momirealms/customfishing/command/sub/DebugCommand.java b/plugin/src/main/java/net/momirealms/customfishing/command/sub/DebugCommand.java index 4478cb18..b4d049a2 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/command/sub/DebugCommand.java +++ b/plugin/src/main/java/net/momirealms/customfishing/command/sub/DebugCommand.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.command.sub; import dev.jorel.commandapi.CommandAPICommand; diff --git a/plugin/src/main/java/net/momirealms/customfishing/command/sub/StatisticsCommand.java b/plugin/src/main/java/net/momirealms/customfishing/command/sub/StatisticsCommand.java index da076172..5df559ef 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/command/sub/StatisticsCommand.java +++ b/plugin/src/main/java/net/momirealms/customfishing/command/sub/StatisticsCommand.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.command.sub; import dev.jorel.commandapi.CommandAPICommand; diff --git a/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java b/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java index 6f8c34be..f6793954 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/compatibility/IntegrationManagerImpl.java @@ -33,7 +33,6 @@ import net.momirealms.customfishing.compatibility.level.*; import net.momirealms.customfishing.compatibility.quest.BattlePassHook; import net.momirealms.customfishing.compatibility.quest.BetonQuestHook; import net.momirealms.customfishing.compatibility.quest.ClueScrollsHook; -import net.momirealms.customfishing.compatibility.quest.NotQuestHook; import net.momirealms.customfishing.compatibility.season.CustomCropsSeasonImpl; import net.momirealms.customfishing.compatibility.season.RealisticSeasonsImpl; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/net/momirealms/customfishing/mechanic/totem/block/property/HalfImpl.java b/plugin/src/main/java/net/momirealms/customfishing/mechanic/totem/block/property/HalfImpl.java index 2fa82d42..f9eb9e14 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/mechanic/totem/block/property/HalfImpl.java +++ b/plugin/src/main/java/net/momirealms/customfishing/mechanic/totem/block/property/HalfImpl.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.mechanic.totem.block.property; import org.bukkit.Axis; diff --git a/plugin/src/main/java/net/momirealms/customfishing/util/CompletableFutures.java b/plugin/src/main/java/net/momirealms/customfishing/util/CompletableFutures.java index 8d21cbf1..96223153 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/util/CompletableFutures.java +++ b/plugin/src/main/java/net/momirealms/customfishing/util/CompletableFutures.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.util; import com.google.common.collect.ImmutableList; diff --git a/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java b/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java index 56f4c8ff..969af453 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java +++ b/plugin/src/main/java/net/momirealms/customfishing/util/ItemUtils.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) <2022> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package net.momirealms.customfishing.util; import de.tr7zw.changeme.nbtapi.NBTCompound;