From 64d6d1929d440dae015db66723be428f4c49dc6c Mon Sep 17 00:00:00 2001 From: YouHaveTrouble Date: Sat, 19 Oct 2024 20:26:15 +0200 Subject: [PATCH] clean up --- .../enchantio/EnchantioBootstrap.java | 8 +---- .../enchantio/enchants/EnchantioEnchant.java | 32 +++++++++---------- .../enchantio/enchants/SoulboundEnchant.java | 3 +- .../enchantio/enchants/TelepathyEnchant.java | 1 + 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/main/java/me/youhavetrouble/enchantio/EnchantioBootstrap.java b/src/main/java/me/youhavetrouble/enchantio/EnchantioBootstrap.java index 0fd2de3..599cf99 100644 --- a/src/main/java/me/youhavetrouble/enchantio/EnchantioBootstrap.java +++ b/src/main/java/me/youhavetrouble/enchantio/EnchantioBootstrap.java @@ -2,7 +2,6 @@ package me.youhavetrouble.enchantio; import io.papermc.paper.plugin.bootstrap.BootstrapContext; import io.papermc.paper.plugin.bootstrap.PluginBootstrap; -import io.papermc.paper.plugin.bootstrap.PluginProviderContext; import io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents; import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; @@ -14,13 +13,12 @@ import me.youhavetrouble.enchantio.enchants.EnchantioEnchant; import me.youhavetrouble.enchantio.enchants.SoulboundEnchant; import me.youhavetrouble.enchantio.enchants.TelepathyEnchant; import org.bukkit.enchantments.Enchantment; -import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; import java.util.HashSet; import java.util.Set; -@SuppressWarnings("all") +@SuppressWarnings("UnstableApiUsage") public class EnchantioBootstrap implements PluginBootstrap { @Override public void bootstrap(@NotNull BootstrapContext context) { @@ -65,8 +63,4 @@ public class EnchantioBootstrap implements PluginBootstrap { } - @Override - public @NotNull JavaPlugin createPlugin(@NotNull PluginProviderContext context) { - return PluginBootstrap.super.createPlugin(context); - } } diff --git a/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java b/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java index c2a3ab0..4e5c295 100644 --- a/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java +++ b/src/main/java/me/youhavetrouble/enchantio/enchants/EnchantioEnchant.java @@ -11,37 +11,35 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.EquipmentSlotGroup; import org.bukkit.inventory.ItemType; -import java.util.Collections; -import java.util.Map; import java.util.Set; -@SuppressWarnings("all") +@SuppressWarnings("UnstableApiUsage") public interface EnchantioEnchant { - public Key getKey(); + Key getKey(); - public Component getDescription(); + Component getDescription(); - public int getAnvilCost(); + int getAnvilCost(); - public int getMaxLevel(); + int getMaxLevel(); - public int getWeight(); + int getWeight(); - public EnchantmentRegistryEntry.EnchantmentCost getMinimumCost(); + EnchantmentRegistryEntry.EnchantmentCost getMinimumCost(); - public EnchantmentRegistryEntry.EnchantmentCost getMaximumCost(); + EnchantmentRegistryEntry.EnchantmentCost getMaximumCost(); - public Iterable getActiveSlots(); + Iterable getActiveSlots(); - public boolean canGetFromEnchantingTable(); + boolean canGetFromEnchantingTable(); - public default TagEntry getTagEntry() { + TagKey getTagForSupportedItems(); + + Set> getSupportedItems(); + + default TagEntry getTagEntry() { return TagEntry.valueEntry(TypedKey.create(RegistryKey.ENCHANTMENT, getKey())); } - public TagKey getTagForSupportedItems(); - - public Set> getSupportedItems(); - } diff --git a/src/main/java/me/youhavetrouble/enchantio/enchants/SoulboundEnchant.java b/src/main/java/me/youhavetrouble/enchantio/enchants/SoulboundEnchant.java index 6ab917d..1bef342 100644 --- a/src/main/java/me/youhavetrouble/enchantio/enchants/SoulboundEnchant.java +++ b/src/main/java/me/youhavetrouble/enchantio/enchants/SoulboundEnchant.java @@ -12,6 +12,7 @@ import org.bukkit.inventory.ItemType; import java.util.Set; +@SuppressWarnings("UnstableApiUsage") public class SoulboundEnchant implements EnchantioEnchant { public static final Key KEY = Key.key("enchantio:soulbound"); @@ -23,7 +24,7 @@ public class SoulboundEnchant implements EnchantioEnchant { @Override public Component getDescription() { - return Component.translatable("enchantio.enchant.soulbound","Soulbound"); + return Component.translatable("enchantio.enchant.soulbound", "Soulbound"); } @Override diff --git a/src/main/java/me/youhavetrouble/enchantio/enchants/TelepathyEnchant.java b/src/main/java/me/youhavetrouble/enchantio/enchants/TelepathyEnchant.java index 6578e6b..0cf774f 100644 --- a/src/main/java/me/youhavetrouble/enchantio/enchants/TelepathyEnchant.java +++ b/src/main/java/me/youhavetrouble/enchantio/enchants/TelepathyEnchant.java @@ -12,6 +12,7 @@ import org.bukkit.inventory.ItemType; import java.util.Set; +@SuppressWarnings("UnstableApiUsage") public class TelepathyEnchant implements EnchantioEnchant { public static final Key KEY = Key.key("enchantio:telepathy");