diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java index 46d0cdf7..7107c0d9 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java @@ -17,6 +17,8 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; @@ -25,13 +27,13 @@ import java.util.List; public class Menu { - private String id; - private String title; - private int rows; - private ConfigurationNode config; - private String permissionNode; + private final String id; + private final String title; + private final int rows; + private final ConfigurationNode config; + private final String permissionNode; - public Menu(String id, ConfigurationNode config) { + public Menu(String id, @NotNull ConfigurationNode config) { this.id = id; this.config = config; @@ -58,7 +60,7 @@ public class Menu { openMenu(user, false); } - public void openMenu(CosmeticUser user, boolean ignorePermission) { + public void openMenu(@NotNull CosmeticUser user, boolean ignorePermission) { Player player = user.getPlayer(); if (player == null) return; if (!ignorePermission && !permissionNode.isEmpty()) { @@ -97,7 +99,8 @@ public class Menu { } - private Gui getItems(CosmeticUser user, Gui gui) { + @Contract("_, _ -> param2") + private Gui getItems(@NotNull CosmeticUser user, Gui gui) { Player player = user.getPlayer(); for (ConfigurationNode config : config.node("items").childrenMap().values()) { @@ -164,7 +167,8 @@ public class Menu { return gui; } - private List getSlots(List slotString) { + @NotNull + private List getSlots(@NotNull List slotString) { List slots = new ArrayList<>(); for (String a : slotString) { @@ -181,6 +185,7 @@ public class Menu { return slots; } + @NotNull private List getSlots(int small, int max) { List slots = new ArrayList<>(); @@ -188,7 +193,9 @@ public class Menu { return slots; } - private ItemStack updateLore(CosmeticUser user, ItemStack itemStack, Type type, ConfigurationNode config) { + @Contract("_, _, _, _ -> param2") + @NotNull + private ItemStack updateLore(CosmeticUser user, @NotNull ItemStack itemStack, Type type, ConfigurationNode config) { if (itemStack.hasItemMeta()) { itemStack.setItemMeta(type.setLore(user, config, itemStack.getItemMeta())); } @@ -201,7 +208,6 @@ public class Menu { public boolean canOpen(Player player) { if (permissionNode.isEmpty()) return true; - if (player.isOp() || player.hasPermission(permissionNode)) return true; - return false; + return player.isOp() || player.hasPermission(permissionNode); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java index 63dc13b2..0e988cb5 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menus.java @@ -4,6 +4,8 @@ import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import org.apache.commons.io.FilenameUtils; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.CommentedConfigurationNode; import org.spongepowered.configurate.ConfigurateException; import org.spongepowered.configurate.yaml.YamlConfigurationLoader; @@ -17,21 +19,23 @@ import java.util.logging.Level; public class Menus { - private static HashMap MENUS = new HashMap<>(); + private static final HashMap MENUS = new HashMap<>(); public static void addMenu(Menu menu) { MENUS.put(menu.getId().toUpperCase(), menu); } - public static Menu getMenu(String id) { + public static Menu getMenu(@NotNull String id) { return MENUS.get(id.toUpperCase()); } + @Contract(pure = true) + @NotNull public static Collection getMenu() { return MENUS.values(); } - public static boolean hasMenu(String id) { + public static boolean hasMenu(@NotNull String id) { return MENUS.containsKey(id.toUpperCase()); } @@ -41,6 +45,7 @@ public class Menus { public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); } + @NotNull public static List getMenuNames() { List names = new ArrayList<>(); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Action.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Action.java index bb20ce58..7b35aad2 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Action.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Action.java @@ -1,12 +1,13 @@ package com.hibiscusmc.hmccosmetics.gui.action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.jetbrains.annotations.NotNull; public class Action { - private String id; + private final String id; - public Action(String id) { + public Action(@NotNull String id) { this.id = id.toUpperCase(); Actions.addAction(this); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java index 35cab251..8f931a9e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/Actions.java @@ -4,13 +4,14 @@ import com.hibiscusmc.hmccosmetics.gui.action.actions.*; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import org.apache.commons.lang.StringUtils; +import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.List; public class Actions { - private static HashMap actions = new HashMap<>(); + private static final HashMap actions = new HashMap<>(); // [ID] private static ActionMessage ACTION_MESSAGE = new ActionMessage(); @@ -27,11 +28,11 @@ public class Actions { private static ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle(); - public static Action getAction(String id) { + public static Action getAction(@NotNull String id) { return actions.get(id.toUpperCase()); } - public static boolean isAction(String id) { + public static boolean isAction(@NotNull String id) { return actions.containsKey(id.toUpperCase()); } @@ -39,7 +40,7 @@ public class Actions { actions.put(action.getId().toUpperCase(), action); } - public static void runActions(CosmeticUser user, List raw) { + public static void runActions(CosmeticUser user, @NotNull List raw) { for (String a : raw) { String id = StringUtils.substringBetween(a, "[", "]").toUpperCase(); String message = StringUtils.substringAfter(a, "] "); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCloseMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCloseMenu.java index 5590eac6..10263744 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCloseMenu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCloseMenu.java @@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.jetbrains.annotations.NotNull; public class ActionCloseMenu extends Action { @@ -10,7 +11,7 @@ public class ActionCloseMenu extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { user.getPlayer().closeInventory(); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionConsoleCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionConsoleCommand.java index f89a3bc1..7513141e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionConsoleCommand.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionConsoleCommand.java @@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.jetbrains.annotations.NotNull; public class ActionConsoleCommand extends Action { @@ -11,7 +12,7 @@ public class ActionConsoleCommand extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { HMCCosmeticsPlugin.getInstance().getServer().dispatchCommand(user.getPlayer(), raw); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticHide.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticHide.java index 40597a76..13f52e4d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticHide.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticHide.java @@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.jetbrains.annotations.NotNull; public class ActionCosmeticHide extends Action { @@ -10,10 +11,9 @@ public class ActionCosmeticHide extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { if (!user.getHidden()) { user.hideCosmetics(CosmeticUser.HiddenReason.ACTION); - return; } } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java index 13c33d97..3b65edf0 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticShow.java @@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.jetbrains.annotations.NotNull; public class ActionCosmeticShow extends Action { @@ -10,7 +11,7 @@ public class ActionCosmeticShow extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { if (user.getHidden()) { if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; // Do not hide if its already off for WG user.showCosmetics(); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java index fe4c1ab2..60587785 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionCosmeticToggle.java @@ -2,6 +2,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; +import org.jetbrains.annotations.NotNull; public class ActionCosmeticToggle extends Action { @@ -10,13 +11,12 @@ public class ActionCosmeticToggle extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { if (user.getHidden()) { if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; user.showCosmetics(); return; } user.hideCosmetics(CosmeticUser.HiddenReason.ACTION); - return; } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMessage.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMessage.java index 6e295e16..d02516d6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMessage.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionMessage.java @@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; +import org.jetbrains.annotations.NotNull; public class ActionMessage extends Action { @@ -11,7 +12,7 @@ public class ActionMessage extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { MessagesUtil.sendMessageNoKey(user.getPlayer(), raw); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java index 0436403a..374eeb97 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionParticle.java @@ -5,7 +5,6 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import com.hibiscusmc.hmccosmetics.util.ServerUtils; import com.hibiscusmc.hmccosmetics.util.packets.PacketManager; -import com.owen1212055.particlehelper.api.particle.Particle; import com.owen1212055.particlehelper.api.particle.types.BlockDataParticle; import com.owen1212055.particlehelper.api.particle.types.DestinationParticle; import com.owen1212055.particlehelper.api.particle.types.velocity.VelocityParticle; @@ -14,6 +13,7 @@ import com.owen1212055.particlehelper.api.type.Particles; import org.bukkit.Location; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; public class ActionParticle extends Action { @@ -22,7 +22,7 @@ public class ActionParticle extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(CosmeticUser user, @NotNull String raw) { String[] rawString = raw.split(" "); var particleType = Particles.fromKey(NamespacedKey.minecraft(rawString[0].toLowerCase())); if (particleType == null) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionPlayerCommand.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionPlayerCommand.java index dc629e71..055737fc 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionPlayerCommand.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionPlayerCommand.java @@ -3,6 +3,7 @@ package com.hibiscusmc.hmccosmetics.gui.action.actions; import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; +import org.jetbrains.annotations.NotNull; public class ActionPlayerCommand extends Action { @@ -11,7 +12,7 @@ public class ActionPlayerCommand extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, String raw) { user.getPlayer().performCommand(MessagesUtil.processStringNoKeyString(user.getPlayer(), raw)); } } \ No newline at end of file diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionSound.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionSound.java index e92df30d..b43f193a 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionSound.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/action/actions/ActionSound.java @@ -4,6 +4,7 @@ import com.hibiscusmc.hmccosmetics.gui.action.Action; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.util.logging.Level; @@ -15,7 +16,7 @@ public class ActionSound extends Action { } @Override - public void run(CosmeticUser user, String raw) { + public void run(@NotNull CosmeticUser user, @NotNull String raw) { Player player = user.getPlayer(); String[] processedString = raw.split(" "); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java index 2ea1681c..f141e433 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/special/DyeMenu.java @@ -17,13 +17,12 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; import org.bukkit.inventory.meta.MapMeta; import org.bukkit.inventory.meta.PotionMeta; +import org.jetbrains.annotations.NotNull; public class DyeMenu { // Yes, I do know how tacted on this feels. - - - public static void openMenu(CosmeticUser user, Cosmetic cosmetic) { + public static void openMenu(@NotNull CosmeticUser user, Cosmetic cosmetic) { ItemStack originalItem = user.getUserCosmeticItem(cosmetic); if (originalItem == null || !cosmetic.isDyable()) return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java index 5311c446..59a4e56f 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Type.java @@ -7,7 +7,7 @@ import org.spongepowered.configurate.ConfigurationNode; public class Type { - private String id; + private final String id; public Type(String id) { this.id = id; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Types.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Types.java index 9d39eace..bbb4ded0 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Types.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/Types.java @@ -2,21 +2,22 @@ package com.hibiscusmc.hmccosmetics.gui.type; import com.hibiscusmc.hmccosmetics.gui.type.types.TypeCosmetic; import com.hibiscusmc.hmccosmetics.gui.type.types.TypeEmpty; +import org.jetbrains.annotations.NotNull; import java.util.HashMap; public class Types { - private static HashMap types = new HashMap<>(); + private static final HashMap types = new HashMap<>(); private static TypeCosmetic TYPE_COSMETIC = new TypeCosmetic(); private static TypeEmpty TYPE_EMPTY = new TypeEmpty(); - public static Type getType(String id) { + public static Type getType(@NotNull String id) { return types.get(id.toUpperCase()); } - public static boolean isType(String id) { + public static boolean isType(@NotNull String id) { return types.containsKey(id.toUpperCase()); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java index cfd717b7..bbb386b6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeCosmetic.java @@ -17,6 +17,8 @@ import org.bukkit.Bukkit; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.meta.ItemMeta; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; @@ -31,7 +33,7 @@ public class TypeCosmetic extends Type { } @Override - public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) { + public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) { if (config.node("cosmetic").virtual()) return; String cosmeticName = config.node("cosmetic").getString(); Cosmetic cosmetic = Cosmetics.getCosmetic(cosmeticName); @@ -92,7 +94,7 @@ public class TypeCosmetic extends Type { } @Override - public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) { + public ItemMeta setLore(CosmeticUser user, @NotNull ConfigurationNode config, ItemMeta itemMeta) { List processedLore = new ArrayList<>(); if (config.node("cosmetic").virtual()) return processLoreLines(user, itemMeta);; @@ -143,7 +145,9 @@ public class TypeCosmetic extends Type { return itemMeta; } - private ItemMeta processLoreLines(CosmeticUser user, ItemMeta itemMeta) { + @Contract("_, _ -> param2") + @NotNull + private ItemMeta processLoreLines(CosmeticUser user, @NotNull ItemMeta itemMeta) { List processedLore = new ArrayList<>(); if (itemMeta.hasLore()) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java index 6ede404f..a5f53331 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/type/types/TypeEmpty.java @@ -8,6 +8,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.meta.ItemMeta; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; @@ -25,7 +26,7 @@ public class TypeEmpty extends Type { // This is the code that's run when the item is clicked. @Override - public void run(CosmeticUser user, ConfigurationNode config, ClickType clickType) { + public void run(CosmeticUser user, @NotNull ConfigurationNode config, ClickType clickType) { List actionStrings = new ArrayList<>(); // List where we keep the actions the server will execute. ConfigurationNode actionConfig = config.node("actions"); // Configuration node that actions are under. @@ -53,7 +54,7 @@ public class TypeEmpty extends Type { } @Override - public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) { + public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, @NotNull ItemMeta itemMeta) { List processedLore = new ArrayList<>(); if (itemMeta.hasLore()) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hook.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hook.java index c8aaa450..5757c8b1 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hook.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hook.java @@ -5,7 +5,7 @@ import org.bukkit.inventory.ItemStack; public class Hook implements Listener { - private String id; + private final String id; private boolean active; private boolean itemHook; @@ -19,7 +19,7 @@ public class Hook implements Listener { // Override } - public ItemStack getItem(String itemid) { + public ItemStack getItem(String itemId) { return null; // Override } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java index b3da5227..59a7401a 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/Hooks.java @@ -8,12 +8,14 @@ import com.hibiscusmc.hmccosmetics.hooks.placeholders.HookPlaceholderAPI; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.HashMap; public class Hooks { - private static HashMap hooks = new HashMap<>(); + private static final HashMap hooks = new HashMap<>(); private static HookOraxen ORAXEN_HOOK = new HookOraxen(); private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder(); private static HookLooty LOOTY_HOOK = new HookLooty(); @@ -23,11 +25,11 @@ public class Hooks { private static HookPremiumVanish PREMIUM_VANISH_HOOK = new HookPremiumVanish(); private static HookSuperVanish SUPER_VANISH_HOOK = new HookSuperVanish(); - public static Hook getHook(String id) { + public static Hook getHook(@NotNull String id) { return hooks.get(id.toLowerCase()); } - public static boolean isItemHook(String id) { + public static boolean isItemHook(@NotNull String id) { return hooks.containsKey(id.toLowerCase()); } @@ -46,7 +48,8 @@ public class Hooks { } } - public static ItemStack getItem(String raw) { + @Nullable + public static ItemStack getItem(@NotNull String raw) { if (!raw.contains(":")) { Material mat = Material.getMaterial(raw.toUpperCase()); if (mat == null) return null; @@ -61,8 +64,7 @@ public class Hooks { Hook hook = getHook(split[0]); if (!hook.hasEnabledItemHook()) return null; if (!hook.getActive()) return null; - ItemStack item = hook.getItem(split[1]); - return item; + return hook.getItem(split[1]); } public static boolean isActiveHook(String id) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java index 96ebe9b0..193b12d1 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookHMCCosmetics.java @@ -14,8 +14,8 @@ public class HookHMCCosmetics extends Hook implements Listener { } @Override - public ItemStack getItem(String itemid) { - Cosmetic cosmetic = Cosmetics.getCosmetic(itemid); + public ItemStack getItem(String itemId) { + Cosmetic cosmetic = Cosmetics.getCosmetic(itemId); if (cosmetic == null) return null; return cosmetic.getItem(); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java index f74fb16d..bf37f3d8 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookItemAdder.java @@ -21,9 +21,9 @@ public class HookItemAdder extends Hook implements Listener { } @Override - public ItemStack getItem(String itemid) { + public ItemStack getItem(String itemId) { if (enabled) { - CustomStack stack = CustomStack.getInstance(itemid); + CustomStack stack = CustomStack.getInstance(itemId); if (stack == null) return null; return stack.getItemStack(); } else { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java index bda7021f..b330ef54 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookLooty.java @@ -14,8 +14,8 @@ public class HookLooty extends Hook implements Listener { } @Override - public ItemStack getItem(String itemid) { - PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemid); + public ItemStack getItem(String itemId) { + PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemId); if (prefabKey == null) return null; return LootyFactory.INSTANCE.createFromPrefab(prefabKey); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookMythic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookMythic.java index ef07b22d..7b1972bd 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookMythic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookMythic.java @@ -12,7 +12,7 @@ public class HookMythic extends Hook implements Listener { } @Override - public ItemStack getItem(String itemid) { - return MythicBukkit.inst().getItemManager().getItemStack(itemid); + public ItemStack getItem(String itemId) { + return MythicBukkit.inst().getItemManager().getItemStack(itemId); } } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookOraxen.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookOraxen.java index baf9bcb9..3a808e42 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookOraxen.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/items/HookOraxen.java @@ -14,8 +14,8 @@ public class HookOraxen extends Hook implements Listener { } @Override - public ItemStack getItem(String itemid) { - ItemBuilder builder = OraxenItems.getItemById(itemid); + public ItemStack getItem(String itemId) { + ItemBuilder builder = OraxenItems.getItemById(itemId); if (builder == null) return null; return builder.build(); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java index 072d348a..751b5f66 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookPremiumVanish.java @@ -8,6 +8,7 @@ import de.myzelyam.api.vanish.PlayerShowEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.jetbrains.annotations.NotNull; public class HookPremiumVanish extends Hook implements Listener { @@ -18,7 +19,7 @@ public class HookPremiumVanish extends Hook implements Listener { } @EventHandler - public void onPlayerVanish(PlayerHideEvent event) { + public void onPlayerVanish(@NotNull PlayerHideEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); if (user == null) return; @@ -26,7 +27,7 @@ public class HookPremiumVanish extends Hook implements Listener { } @EventHandler - public void onPlayerShow(PlayerShowEvent event) { + public void onPlayerShow(@NotNull PlayerShowEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); if (user == null) return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java index d7a39e0c..750e5310 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/misc/HookSuperVanish.java @@ -8,6 +8,7 @@ import de.myzelyam.api.vanish.PlayerShowEvent; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; +import org.jetbrains.annotations.NotNull; public class HookSuperVanish extends Hook implements Listener { @@ -18,7 +19,7 @@ public class HookSuperVanish extends Hook implements Listener { } @EventHandler - public void onPlayerVanish(PlayerHideEvent event) { + public void onPlayerVanish(@NotNull PlayerHideEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); if (user == null) return; @@ -26,7 +27,7 @@ public class HookSuperVanish extends Hook implements Listener { } @EventHandler - public void onPlayerShow(PlayerShowEvent event) { + public void onPlayerShow(@NotNull PlayerShowEvent event) { Player player = event.getPlayer(); CosmeticUser user = CosmeticUsers.getUser(player); if (user == null) return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java index 3aec14c1..1aed68ab 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/placeholders/HMCPlaceholderExpansion.java @@ -25,22 +25,25 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { } @Override - public @NotNull String getIdentifier() { + @NotNull + public String getIdentifier() { return "HMCCosmetics"; } @Override - public @NotNull String getAuthor() { + @NotNull + public String getAuthor() { return "HibiscusMC"; } @Override - public @NotNull String getVersion() { + @NotNull + public String getVersion() { return HMCCosmeticsPlugin.getInstance().getDescription().getVersion(); } @Override - public String onRequest(OfflinePlayer player, String params) { + public String onRequest(@NotNull OfflinePlayer player, @NotNull String params) { if (!player.isOnline()) return null; CosmeticUser user = CosmeticUsers.getUser(player.getPlayer()); if (user == null) return null; @@ -132,13 +135,13 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { return null; } - public String getMaterial(Cosmetic cosmetic) { + public String getMaterial(@NotNull Cosmetic cosmetic) { ItemStack item = cosmetic.getItem(); if (item == null) return null; return cosmetic.getItem().getType().toString(); } - public String getModelData(Cosmetic cosmetic) { + public String getModelData(@NotNull Cosmetic cosmetic) { ItemStack item = cosmetic.getItem(); if (item == null) return null; if (!item.hasItemMeta()) return null; @@ -146,7 +149,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { return String.valueOf(itemMeta.getCustomModelData()); } - public String getItemName(Cosmetic cosmetic) { + public String getItemName(@NotNull Cosmetic cosmetic) { ItemStack item = cosmetic.getItem(); if (item == null) return null; if (!item.hasItemMeta()) return null; @@ -154,7 +157,7 @@ public class HMCPlaceholderExpansion extends PlaceholderExpansion { return itemMeta.getDisplayName(); } - public String getItemLore(Cosmetic cosmetic) { + public String getItemLore(@NotNull Cosmetic cosmetic) { ItemStack item = cosmetic.getItem(); if (item == null) return null; if (item.hasItemMeta()) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java index 611d7a32..bd1c2345 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/hooks/worldguard/WGListener.java @@ -12,11 +12,12 @@ import org.bukkit.Location; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerMoveEvent; +import org.jetbrains.annotations.NotNull; public class WGListener implements Listener { @EventHandler - public void onPlayerMove(PlayerMoveEvent event) { + public void onPlayerMove(@NotNull PlayerMoveEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) return; Location location = event.getPlayer().getLocation();