From d508ecd4c04724088e7c1f53dfbfdfcc5f92c3e3 Mon Sep 17 00:00:00 2001 From: Craftinators Date: Fri, 24 Feb 2023 12:21:53 -0500 Subject: [PATCH] clean: cosmetic annotation changes --- .../hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java | 6 +++--- .../cosmetic/types/CosmeticArmorType.java | 5 +++-- .../cosmetic/types/CosmeticBackpackType.java | 7 +++++-- .../cosmetic/types/CosmeticBalloonType.java | 11 +++++++---- .../cosmetic/types/CosmeticEmoteType.java | 5 +++-- .../cosmetic/types/CosmeticMainhandType.java | 4 ++-- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java index fede6387..95632523 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/Cosmetic.java @@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; @@ -19,7 +20,7 @@ public class Cosmetic { private CosmeticSlot slot; private boolean dyable; - protected Cosmetic(String id, ConfigurationNode config) { + protected Cosmetic(String id, @NotNull ConfigurationNode config) { this.id = id; if (!config.node("permission").virtual()) { this.permission = config.node("permission").getString(); @@ -58,8 +59,7 @@ public class Cosmetic { } public boolean requiresPermission() { - if (permission == null) return false; - return true; + return permission != null; } public void setId(String id) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java index c8748f2f..84e7eb55 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticArmorType.java @@ -7,11 +7,12 @@ import com.hibiscusmc.hmccosmetics.util.packets.PacketManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; public class CosmeticArmorType extends Cosmetic { - private EquipmentSlot equipSlot; + private final EquipmentSlot equipSlot; public CosmeticArmorType(String id, ConfigurationNode config) { super(id, config); @@ -20,7 +21,7 @@ public class CosmeticArmorType extends Cosmetic { } @Override - public void update(CosmeticUser user) { + public void update(@NotNull CosmeticUser user) { Player player = Bukkit.getPlayer(user.getUniqueId()); if (player == null) return; if (equipSlot.equals(EquipmentSlot.OFF_HAND)) { diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java index 85edbfa9..660381ce 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBackpackType.java @@ -6,11 +6,12 @@ import com.hibiscusmc.hmccosmetics.util.packets.PacketManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; public class CosmeticBackpackType extends Cosmetic { - private String modelName; + private final String modelName; private ConfigurationNode config; public CosmeticBackpackType(String id, ConfigurationNode config) { @@ -21,8 +22,10 @@ public class CosmeticBackpackType extends Cosmetic { } @Override - public void update(CosmeticUser user) { + public void update(@NotNull CosmeticUser user) { Player player = Bukkit.getPlayer(user.getUniqueId()); + if (player == null) return; + Location loc = player.getLocation().clone().add(0, 2, 0); if (user.isInWardrobe() || !user.isBackupSpawned()) return; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java index 82c4e026..b6238b05 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticBalloonType.java @@ -9,6 +9,7 @@ import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.util.Vector; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; import org.spongepowered.configurate.serialize.SerializationException; @@ -16,7 +17,7 @@ import java.util.List; public class CosmeticBalloonType extends Cosmetic { - private String modelName; + private final String modelName; private List dyableParts; //private HashMap animationBalloons; @@ -46,12 +47,14 @@ public class CosmeticBalloonType extends Cosmetic { } @Override - public void update(CosmeticUser user) { + public void update(@NotNull CosmeticUser user) { Player player = Bukkit.getPlayer(user.getUniqueId()); UserBalloonManager userBalloonManager = user.getBalloonManager(); - Location newLocation = player.getLocation(); - if (player == null || userBalloonManager == null || newLocation == null) return; + + if (player == null || userBalloonManager == null) return; if (user.isInWardrobe()) return; + + Location newLocation = player.getLocation(); Location currentLocation = user.getBalloonManager().getLocation(); newLocation = newLocation.clone().add(Settings.getBalloonOffset()); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticEmoteType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticEmoteType.java index ffceea9f..49b6f1d6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticEmoteType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticEmoteType.java @@ -3,11 +3,12 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.MessagesUtil; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; public class CosmeticEmoteType extends Cosmetic { - private String animationId; + private final String animationId; public CosmeticEmoteType(String id, ConfigurationNode config) { super(id, config); @@ -21,7 +22,7 @@ public class CosmeticEmoteType extends Cosmetic { // Nothing } - public void run(CosmeticUser user) { + public void run(@NotNull CosmeticUser user) { user.getUserEmoteManager().playEmote(this); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java index f4b18644..1935e43e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/cosmetic/types/CosmeticMainhandType.java @@ -5,6 +5,7 @@ import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.util.PlayerUtils; import com.hibiscusmc.hmccosmetics.util.packets.PacketManager; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import org.spongepowered.configurate.ConfigurationNode; public class CosmeticMainhandType extends Cosmetic { @@ -14,10 +15,9 @@ public class CosmeticMainhandType extends Cosmetic { } @Override - public void update(CosmeticUser user) { + public void update(@NotNull CosmeticUser user) { Player player = user.getPlayer(); PacketManager.equipmentSlotUpdate(player.getEntityId(), user, getSlot(), PlayerUtils.getNearbyPlayers(player)); - } }