diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 5aa0a1f7..745c7575 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -7,6 +7,7 @@ repositories { maven("https://jitpack.io/") // rtag maven("https://papermc.io/repo/repository/maven-public/") maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/tag/TagMapImpl.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/tag/TagMapImpl.java index 36870843..d1037eab 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/tag/TagMapImpl.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/item/tag/TagMapImpl.java @@ -28,6 +28,7 @@ import java.util.*; import static net.momirealms.customfishing.api.util.TagUtils.toTypeAndData; import static net.momirealms.customfishing.common.util.ArrayUtils.splitValue; +@SuppressWarnings("unchecked") public class TagMapImpl implements TagMap { private final Map convertedMap = new HashMap<>(); diff --git a/build.gradle.kts b/build.gradle.kts index 6c36e8b6..c74aaad9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,10 +16,6 @@ subprojects { repositories { mavenCentral() - maven("https://jitpack.io/") // sparrow-heart, rtag - maven("https://papermc.io/repo/repository/maven-public/") // paper - maven("https://oss.sonatype.org/content/repositories/snapshots") - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // spigot } tasks.processResources { diff --git a/common/src/main/java/net/momirealms/customfishing/common/command/AbstractCommandManager.java b/common/src/main/java/net/momirealms/customfishing/common/command/AbstractCommandManager.java index a8c51d03..39ce3408 100644 --- a/common/src/main/java/net/momirealms/customfishing/common/command/AbstractCommandManager.java +++ b/common/src/main/java/net/momirealms/customfishing/common/command/AbstractCommandManager.java @@ -89,6 +89,7 @@ public abstract class AbstractCommandManager implements CustomFishingCommandM injectExceptionHandler(CommandExecutionException.class, MinecraftExceptionHandler.createDefaultCommandExecutionHandler(), StandardCaptionKeys.EXCEPTION_UNEXPECTED); } + @SuppressWarnings("unchecked") private void injectExceptionHandler(Class type, MinecraftExceptionHandler.MessageFactory factory, Caption key) { getCommandManager().exceptionController().registerHandler(type, ctx -> { final @Nullable ComponentLike message = factory.message(captionFormatter, (ExceptionContext) ctx); diff --git a/compatibility/build.gradle.kts b/compatibility/build.gradle.kts index 72efc8b4..957645c3 100644 --- a/compatibility/build.gradle.kts +++ b/compatibility/build.gradle.kts @@ -1,6 +1,7 @@ repositories { maven("https://maven.enginehub.org/repo/") // worldguard worldedit maven("https://jitpack.io/") // itemsadder customcrops + maven("https://papermc.io/repo/repository/maven-public/") // paper maven("https://mvn.lumine.io/repository/maven-public/") // mythicmobs maven("https://nexus.phoenixdevt.fr/repository/maven-public/") // mmoitems maven("https://papermc.io/repo/repository/maven-public/") @@ -10,6 +11,7 @@ repositories { maven("https://repo.auxilor.io/repository/maven-public/") // eco maven("https://nexus.betonquest.org/repository/betonquest/") // betonquest maven("https://repo.dmulloy2.net/repository/public/") // betonquest needs packet wrapper? + maven("https://oss.sonatype.org/content/repositories/snapshots") } dependencies { diff --git a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/quest/BattlePassQuest.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/quest/BattlePassQuest.java index 00dfcc25..38c71b20 100644 --- a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/quest/BattlePassQuest.java +++ b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/quest/BattlePassQuest.java @@ -47,6 +47,7 @@ public class BattlePassQuest implements Listener { private static class BPFishingQuest extends ActionQuestExecutor { + @SuppressWarnings("deprecation") public BPFishingQuest(JavaPlugin plugin) { super(plugin, "customfishing"); } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 06778943..a1093484 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,5 +1,3 @@ -val git_version: String by project - plugins { id("io.github.goooler.shadow") version "8.1.8" } @@ -7,6 +5,10 @@ plugins { repositories { maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi maven("https://libraries.minecraft.net") // brigadier + maven("https://jitpack.io/") // sparrow-heart, rtag + maven("https://papermc.io/repo/repository/maven-public/") // paper + maven("https://oss.sonatype.org/content/repositories/snapshots") + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") // spigot } dependencies { @@ -58,7 +60,7 @@ dependencies { tasks { shadowJar { - archiveFileName = "CustomFishing-${rootProject.properties["project_version"]}-${git_version}.jar" + archiveFileName = "CustomFishing-${rootProject.properties["project_version"]}.jar" destinationDirectory.set(file("$rootDir/target")) relocate("net.kyori", "net.momirealms.customfishing.libraries") relocate("org.incendo", "net.momirealms.customfishing.libraries") diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/action/BukkitActionManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/action/BukkitActionManager.java index 9e530e1e..20fca008 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/action/BukkitActionManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/action/BukkitActionManager.java @@ -49,6 +49,7 @@ import net.momirealms.sparrow.heart.feature.armorstand.FakeArmorStand; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; +import org.bukkit.Registry; import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; @@ -645,6 +646,8 @@ public class BukkitActionManager implements ActionManager { }); } + // The registry name changes a lot + @SuppressWarnings("deprecation") private void registerPotionAction() { registerAction("potion-effect", (args, chance) -> { if (args instanceof Section section) { diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java index 509b13e1..99de3c30 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java @@ -332,6 +332,7 @@ public class BukkitConfigManager extends ConfigManager { return Pair.of(Key.of(split[0], split[1]), Short.parseShort(split[2])); } + @SuppressWarnings("unchecked") private void registerBuiltInItemProperties() { Function, Context>> f1 = arg -> { Section section = (Section) arg; diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/fishing/BukkitFishingManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/fishing/BukkitFishingManager.java index cbb8f6ee..65596be2 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/fishing/BukkitFishingManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/fishing/BukkitFishingManager.java @@ -193,6 +193,8 @@ public class BukkitFishingManager implements FishingManager, Listener { }); } + // It's not necessary to get component from the event + @SuppressWarnings("deprecation") @EventHandler public void onChat(AsyncPlayerChatEvent event) { if (event.isCancelled()) return; diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/hook/BukkitHookManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/hook/BukkitHookManager.java index 61986a4a..279cdfea 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/hook/BukkitHookManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/hook/BukkitHookManager.java @@ -99,6 +99,7 @@ public class BukkitHookManager implements HookManager, Listener { return wrapped.getTag("CustomFishing", "hook_id").map(o -> (String) o); } + @SuppressWarnings("deprecation") @EventHandler (ignoreCancelled = true) public void onDragDrop(InventoryClickEvent event) { final Player player = (Player) event.getWhoClicked(); @@ -137,6 +138,7 @@ public class BukkitHookManager implements HookManager, Listener { wrapped.removeTag("CustomFishing", "hook_damage"); wrapped.removeTag("CustomFishing", "hook_max_damage"); + // unsafe but have to use this event.setCursor(itemStack); List previousLore = wrapped.lore().orElse(new ArrayList<>()); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/integration/BukkitIntegrationManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/integration/BukkitIntegrationManager.java index 25b475f3..98c30d20 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/integration/BukkitIntegrationManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/integration/BukkitIntegrationManager.java @@ -166,6 +166,7 @@ public class BukkitIntegrationManager implements IntegrationManager { return false; } + @SuppressWarnings("deprecation") private boolean isHooked(String hooked, String... versionPrefix) { Plugin p = Bukkit.getPluginManager().getPlugin(hooked); if (p != null) { diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemManager.java index 0bc2cae3..eace3ccd 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemManager.java @@ -280,6 +280,7 @@ public class BukkitItemManager implements ItemManager, Listener { wrapped.load(); } + @SuppressWarnings("deprecation") @Override public void increaseDamage(Player player, ItemStack itemStack, int amount, boolean incorrectUsage) { if (itemStack == null || itemStack.getType() == Material.AIR || itemStack.getAmount() == 0) @@ -295,6 +296,7 @@ public class BukkitItemManager implements ItemManager, Listener { return; ItemMeta previousMeta = itemStack.getItemMeta().clone(); + // use event from Spigot for compatibility PlayerItemDamageEvent itemDamageEvent = new PlayerItemDamageEvent(player, itemStack, amount); if (EventUtils.fireAndCheckCancel(itemDamageEvent)) { plugin.debug("Another plugin modified the item from `PlayerItemDamageEvent` called by CustomFishing"); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/requirement/BukkitRequirementManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/requirement/BukkitRequirementManager.java index acd351fa..1500fc10 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/requirement/BukkitRequirementManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/requirement/BukkitRequirementManager.java @@ -1131,6 +1131,7 @@ public class BukkitRequirementManager implements RequirementManager { }); } + @SuppressWarnings("deprecation") private void registerPotionEffectRequirement() { registerRequirement("potion-effect", (args, actions, runActions) -> { String potions = (String) args; diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/util/ItemStackUtils.java b/core/src/main/java/net/momirealms/customfishing/bukkit/util/ItemStackUtils.java index 0cf4922c..0bed8d6a 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/util/ItemStackUtils.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/util/ItemStackUtils.java @@ -105,7 +105,7 @@ public class ItemStackUtils { } } - @SuppressWarnings("UnstableApiUsage") + @SuppressWarnings({"unchecked", "UnstableApiUsage"}) public static void sectionToComponentEditor(Section section, List itemEditors) { for (Map.Entry entry : section.getStringRouteMappedValues(false).entrySet()) { String component = entry.getKey(); @@ -272,6 +272,7 @@ public class ItemStackUtils { } // ugly codes, remaining improvements + @SuppressWarnings("unchecked") public static void sectionToTagEditor(Section section, List itemEditors, String... route) { for (Map.Entry entry : section.getStringRouteMappedValues(false).entrySet()) { Object value = entry.getValue();