9
0
mirror of https://github.com/Xiao-MoMi/Custom-Fishing.git synced 2025-12-24 01:19:32 +00:00

Fixed warnings related to build

This commit is contained in:
XiaoMoMi
2024-08-23 16:51:44 +08:00
parent fd5c5da964
commit eaceea08db
15 changed files with 25 additions and 8 deletions

View File

@@ -7,6 +7,7 @@ repositories {
maven("https://jitpack.io/") // rtag maven("https://jitpack.io/") // rtag
maven("https://papermc.io/repo/repository/maven-public/") maven("https://papermc.io/repo/repository/maven-public/")
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi
maven("https://oss.sonatype.org/content/repositories/snapshots")
} }
dependencies { dependencies {

View File

@@ -28,6 +28,7 @@ import java.util.*;
import static net.momirealms.customfishing.api.util.TagUtils.toTypeAndData; import static net.momirealms.customfishing.api.util.TagUtils.toTypeAndData;
import static net.momirealms.customfishing.common.util.ArrayUtils.splitValue; import static net.momirealms.customfishing.common.util.ArrayUtils.splitValue;
@SuppressWarnings("unchecked")
public class TagMapImpl implements TagMap { public class TagMapImpl implements TagMap {
private final Map<String, Object> convertedMap = new HashMap<>(); private final Map<String, Object> convertedMap = new HashMap<>();

View File

@@ -16,10 +16,6 @@ subprojects {
repositories { repositories {
mavenCentral() 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 { tasks.processResources {

View File

@@ -89,6 +89,7 @@ public abstract class AbstractCommandManager<C> implements CustomFishingCommandM
injectExceptionHandler(CommandExecutionException.class, MinecraftExceptionHandler.createDefaultCommandExecutionHandler(), StandardCaptionKeys.EXCEPTION_UNEXPECTED); injectExceptionHandler(CommandExecutionException.class, MinecraftExceptionHandler.createDefaultCommandExecutionHandler(), StandardCaptionKeys.EXCEPTION_UNEXPECTED);
} }
@SuppressWarnings("unchecked")
private void injectExceptionHandler(Class<? extends Throwable> type, MinecraftExceptionHandler.MessageFactory<C, ?> factory, Caption key) { private void injectExceptionHandler(Class<? extends Throwable> type, MinecraftExceptionHandler.MessageFactory<C, ?> factory, Caption key) {
getCommandManager().exceptionController().registerHandler(type, ctx -> { getCommandManager().exceptionController().registerHandler(type, ctx -> {
final @Nullable ComponentLike message = factory.message(captionFormatter, (ExceptionContext) ctx); final @Nullable ComponentLike message = factory.message(captionFormatter, (ExceptionContext) ctx);

View File

@@ -1,6 +1,7 @@
repositories { repositories {
maven("https://maven.enginehub.org/repo/") // worldguard worldedit maven("https://maven.enginehub.org/repo/") // worldguard worldedit
maven("https://jitpack.io/") // itemsadder customcrops 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://mvn.lumine.io/repository/maven-public/") // mythicmobs
maven("https://nexus.phoenixdevt.fr/repository/maven-public/") // mmoitems maven("https://nexus.phoenixdevt.fr/repository/maven-public/") // mmoitems
maven("https://papermc.io/repo/repository/maven-public/") maven("https://papermc.io/repo/repository/maven-public/")
@@ -10,6 +11,7 @@ repositories {
maven("https://repo.auxilor.io/repository/maven-public/") // eco maven("https://repo.auxilor.io/repository/maven-public/") // eco
maven("https://nexus.betonquest.org/repository/betonquest/") // betonquest maven("https://nexus.betonquest.org/repository/betonquest/") // betonquest
maven("https://repo.dmulloy2.net/repository/public/") // betonquest needs packet wrapper? maven("https://repo.dmulloy2.net/repository/public/") // betonquest needs packet wrapper?
maven("https://oss.sonatype.org/content/repositories/snapshots")
} }
dependencies { dependencies {

View File

@@ -47,6 +47,7 @@ public class BattlePassQuest implements Listener {
private static class BPFishingQuest extends ActionQuestExecutor { private static class BPFishingQuest extends ActionQuestExecutor {
@SuppressWarnings("deprecation")
public BPFishingQuest(JavaPlugin plugin) { public BPFishingQuest(JavaPlugin plugin) {
super(plugin, "customfishing"); super(plugin, "customfishing");
} }

View File

@@ -1,5 +1,3 @@
val git_version: String by project
plugins { plugins {
id("io.github.goooler.shadow") version "8.1.8" id("io.github.goooler.shadow") version "8.1.8"
} }
@@ -7,6 +5,10 @@ plugins {
repositories { repositories {
maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") // papi
maven("https://libraries.minecraft.net") // brigadier 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 { dependencies {
@@ -58,7 +60,7 @@ dependencies {
tasks { tasks {
shadowJar { shadowJar {
archiveFileName = "CustomFishing-${rootProject.properties["project_version"]}-${git_version}.jar" archiveFileName = "CustomFishing-${rootProject.properties["project_version"]}.jar"
destinationDirectory.set(file("$rootDir/target")) destinationDirectory.set(file("$rootDir/target"))
relocate("net.kyori", "net.momirealms.customfishing.libraries") relocate("net.kyori", "net.momirealms.customfishing.libraries")
relocate("org.incendo", "net.momirealms.customfishing.libraries") relocate("org.incendo", "net.momirealms.customfishing.libraries")

View File

@@ -49,6 +49,7 @@ import net.momirealms.sparrow.heart.feature.armorstand.FakeArmorStand;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Registry;
import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.ExperienceOrb;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.EquipmentSlot;
@@ -645,6 +646,8 @@ public class BukkitActionManager implements ActionManager<Player> {
}); });
} }
// The registry name changes a lot
@SuppressWarnings("deprecation")
private void registerPotionAction() { private void registerPotionAction() {
registerAction("potion-effect", (args, chance) -> { registerAction("potion-effect", (args, chance) -> {
if (args instanceof Section section) { if (args instanceof Section section) {

View File

@@ -332,6 +332,7 @@ public class BukkitConfigManager extends ConfigManager {
return Pair.of(Key.of(split[0], split[1]), Short.parseShort(split[2])); return Pair.of(Key.of(split[0], split[1]), Short.parseShort(split[2]));
} }
@SuppressWarnings("unchecked")
private void registerBuiltInItemProperties() { private void registerBuiltInItemProperties() {
Function<Object, BiConsumer<Item<ItemStack>, Context<Player>>> f1 = arg -> { Function<Object, BiConsumer<Item<ItemStack>, Context<Player>>> f1 = arg -> {
Section section = (Section) arg; Section section = (Section) arg;

View File

@@ -193,6 +193,8 @@ public class BukkitFishingManager implements FishingManager, Listener {
}); });
} }
// It's not necessary to get component from the event
@SuppressWarnings("deprecation")
@EventHandler @EventHandler
public void onChat(AsyncPlayerChatEvent event) { public void onChat(AsyncPlayerChatEvent event) {
if (event.isCancelled()) return; if (event.isCancelled()) return;

View File

@@ -99,6 +99,7 @@ public class BukkitHookManager implements HookManager, Listener {
return wrapped.getTag("CustomFishing", "hook_id").map(o -> (String) o); return wrapped.getTag("CustomFishing", "hook_id").map(o -> (String) o);
} }
@SuppressWarnings("deprecation")
@EventHandler (ignoreCancelled = true) @EventHandler (ignoreCancelled = true)
public void onDragDrop(InventoryClickEvent event) { public void onDragDrop(InventoryClickEvent event) {
final Player player = (Player) event.getWhoClicked(); 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_damage");
wrapped.removeTag("CustomFishing", "hook_max_damage"); wrapped.removeTag("CustomFishing", "hook_max_damage");
// unsafe but have to use this
event.setCursor(itemStack); event.setCursor(itemStack);
List<String> previousLore = wrapped.lore().orElse(new ArrayList<>()); List<String> previousLore = wrapped.lore().orElse(new ArrayList<>());

View File

@@ -166,6 +166,7 @@ public class BukkitIntegrationManager implements IntegrationManager {
return false; return false;
} }
@SuppressWarnings("deprecation")
private boolean isHooked(String hooked, String... versionPrefix) { private boolean isHooked(String hooked, String... versionPrefix) {
Plugin p = Bukkit.getPluginManager().getPlugin(hooked); Plugin p = Bukkit.getPluginManager().getPlugin(hooked);
if (p != null) { if (p != null) {

View File

@@ -280,6 +280,7 @@ public class BukkitItemManager implements ItemManager, Listener {
wrapped.load(); wrapped.load();
} }
@SuppressWarnings("deprecation")
@Override @Override
public void increaseDamage(Player player, ItemStack itemStack, int amount, boolean incorrectUsage) { public void increaseDamage(Player player, ItemStack itemStack, int amount, boolean incorrectUsage) {
if (itemStack == null || itemStack.getType() == Material.AIR || itemStack.getAmount() == 0) if (itemStack == null || itemStack.getType() == Material.AIR || itemStack.getAmount() == 0)
@@ -295,6 +296,7 @@ public class BukkitItemManager implements ItemManager, Listener {
return; return;
ItemMeta previousMeta = itemStack.getItemMeta().clone(); ItemMeta previousMeta = itemStack.getItemMeta().clone();
// use event from Spigot for compatibility
PlayerItemDamageEvent itemDamageEvent = new PlayerItemDamageEvent(player, itemStack, amount); PlayerItemDamageEvent itemDamageEvent = new PlayerItemDamageEvent(player, itemStack, amount);
if (EventUtils.fireAndCheckCancel(itemDamageEvent)) { if (EventUtils.fireAndCheckCancel(itemDamageEvent)) {
plugin.debug("Another plugin modified the item from `PlayerItemDamageEvent` called by CustomFishing"); plugin.debug("Another plugin modified the item from `PlayerItemDamageEvent` called by CustomFishing");

View File

@@ -1131,6 +1131,7 @@ public class BukkitRequirementManager implements RequirementManager<Player> {
}); });
} }
@SuppressWarnings("deprecation")
private void registerPotionEffectRequirement() { private void registerPotionEffectRequirement() {
registerRequirement("potion-effect", (args, actions, runActions) -> { registerRequirement("potion-effect", (args, actions, runActions) -> {
String potions = (String) args; String potions = (String) args;

View File

@@ -105,7 +105,7 @@ public class ItemStackUtils {
} }
} }
@SuppressWarnings("UnstableApiUsage") @SuppressWarnings({"unchecked", "UnstableApiUsage"})
public static void sectionToComponentEditor(Section section, List<ItemEditor> itemEditors) { public static void sectionToComponentEditor(Section section, List<ItemEditor> itemEditors) {
for (Map.Entry<String, Object> entry : section.getStringRouteMappedValues(false).entrySet()) { for (Map.Entry<String, Object> entry : section.getStringRouteMappedValues(false).entrySet()) {
String component = entry.getKey(); String component = entry.getKey();
@@ -272,6 +272,7 @@ public class ItemStackUtils {
} }
// ugly codes, remaining improvements // ugly codes, remaining improvements
@SuppressWarnings("unchecked")
public static void sectionToTagEditor(Section section, List<ItemEditor> itemEditors, String... route) { public static void sectionToTagEditor(Section section, List<ItemEditor> itemEditors, String... route) {
for (Map.Entry<String, Object> entry : section.getStringRouteMappedValues(false).entrySet()) { for (Map.Entry<String, Object> entry : section.getStringRouteMappedValues(false).entrySet()) {
Object value = entry.getValue(); Object value = entry.getValue();