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 56463b62..1b49c8e1 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 @@ -74,7 +74,7 @@ public class CosmeticBackpackType extends Cosmetic { } } HMCCPacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner); - if (!user.getHidden()) { + if (!user.isHidden()) { //if (loc.getPitch() < -70) NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, new ItemStack(Material.AIR), owner); //else NMSHandlers.getHandler().equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, firstPersonBackpack, owner); PacketManager.equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(this, firstPersonBackpack), owner); 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 4b3aa1eb..72d4f465 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 @@ -84,11 +84,11 @@ public class CosmeticBalloonType extends Cosmetic { HMCCPacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer); HMCCPacketManager.sendLeashPacket(userBalloonManager.getPufferfishBalloonId(), entity.getEntityId(), viewer); - if (user.getHidden()) { + if (user.isHidden()) { userBalloonManager.getPufferfish().hidePufferfish(); return; } - if (!user.getHidden() && showLead) { + if (!user.isHidden() && showLead) { List sendTo = userBalloonManager.getPufferfish().refreshViewers(newLocation); if (sendTo.isEmpty()) return; user.getBalloonManager().getPufferfish().spawnPufferfish(newLocation, sendTo); diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java index e5be6e61..4d76fad1 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/database/types/Data.java @@ -32,7 +32,7 @@ public abstract class Data { @NotNull public final String serializeData(@NotNull CosmeticUser user) { StringBuilder data = new StringBuilder(); - if (user.getHidden()) { + if (user.isHidden()) { if (shouldHiddenSave(user.getHiddenReason())) { data.append("HIDDEN=").append(user.getHiddenReason()); } 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 391ad251..7f30c698 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 @@ -12,7 +12,7 @@ public class ActionCosmeticHide extends Action { @Override public void run(@NotNull CosmeticUser user, String raw) { - if (user.getHidden()) return; + if (user.isHidden()) return; user.hideCosmetics(CosmeticUser.HiddenReason.ACTION); } } 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 a8667e52..1e49a6c4 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 @@ -12,7 +12,7 @@ public class ActionCosmeticShow extends Action { @Override public void run(@NotNull CosmeticUser user, String raw) { - if (!user.getHidden()) return; + if (!user.isHidden()) return; // Do not hide if it's already off for WG if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; 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 89b30c08..da83c797 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 @@ -12,7 +12,7 @@ public class ActionCosmeticToggle extends Action { @Override public void run(@NotNull CosmeticUser user, String raw) { - if (user.getHidden()) { + if (user.isHidden()) { if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; user.showCosmetics(); return; 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 5a8cccbc..0a71f996 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 @@ -30,7 +30,7 @@ public class WGListener implements Listener { if (user == null) return; Location location = event.getPlayer().getLocation(); ApplicableRegionSet set = getRegions(location); - if (user.getHidden()) { + if (user.isHidden()) { if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().isEmpty()) { user.showCosmetics(); } @@ -58,7 +58,7 @@ public class WGListener implements Listener { if (user == null) return; Location location = event.getTo(); ApplicableRegionSet set = getRegions(location); - if (user.getHidden()) { + if (user.isHidden()) { if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().isEmpty()) { user.showCosmetics(); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java index 1aa72922..216bc478 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java @@ -419,7 +419,7 @@ public class PlayerGameListener implements Listener { public void onPlayerUnVanish(HibiscusPlayerUnVanishEvent event) { CosmeticUser user = CosmeticUsers.getUser(event.getPlayer()); if (user == null) return; - if (!user.getHidden()) return; + if (!user.isHidden()) return; if (user.getHiddenReason().equals(CosmeticUser.HiddenReason.PLUGIN)) user.showCosmetics(); } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java index 36b902ff..f1a7d36e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -70,7 +70,7 @@ public class CosmeticUser { Runnable run = () -> { MessagesUtil.sendDebugMessages("Tick[uuid=" + uniqueId + "]", Level.INFO); updateCosmetic(); - if (getHidden() && !getUserEmoteManager().isPlayingEmote()) MessagesUtil.sendActionBar(getPlayer(), "hidden-cosmetics"); + if (isHidden() && !getUserEmoteManager().isPlayingEmote()) MessagesUtil.sendActionBar(getPlayer(), "hidden-cosmetics"); }; int tickPeriod = Settings.getTickPeriod(); @@ -114,7 +114,7 @@ public class CosmeticUser { playerCosmetics.put(cosmetic.getSlot(), cosmetic); if (color != null) colors.put(cosmetic.getSlot(), color); MessagesUtil.sendDebugMessages("addPlayerCosmetic[id=" + cosmetic.getId() + "]"); - if (!getHidden()) { + if (!isHidden()) { if (cosmetic.getSlot() == CosmeticSlot.BACKPACK) { CosmeticBackpackType backpackType = (CosmeticBackpackType) cosmetic; spawnBackpack(backpackType); @@ -557,10 +557,20 @@ public class CosmeticUser { MessagesUtil.sendDebugMessages("ShowCosmetics"); } + + /** + * This method is deprecated and will be removed in the future. Use {@link #isHidden()} instead. + * @return + */ + @Deprecated(since = "2.7.2-DEV", forRemoval = true) public boolean getHidden() { return this.hideCosmetics; } + public boolean isHidden() { + return this.hideCosmetics; + } + public enum HiddenReason { NONE, WORLDGUARD, diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java index 0885c001..df05fab4 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBackpackManager.java @@ -85,7 +85,7 @@ public class UserBackpackManager { else HMCCPacketManager.sendRidingPacket(particleCloud.get(i - 1), particleCloud.get(i) , owner); } HMCCPacketManager.sendRidingPacket(particleCloud.get(particleCloud.size() - 1), user.getUserBackpackManager().getFirstArmorStandId(), owner); - if (!user.getHidden()) PacketManager.equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(cosmeticBackpackType, cosmeticBackpackType.getFirstPersonBackpack()), owner); + if (!user.isHidden()) PacketManager.equipmentSlotUpdate(user.getUserBackpackManager().getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(cosmeticBackpackType, cosmeticBackpackType.getFirstPersonBackpack()), owner); } PacketManager.equipmentSlotUpdate(getFirstArmorStandId(), EquipmentSlot.HEAD, user.getUserCosmeticItem(cosmeticBackpackType), outsideViewers); HMCCPacketManager.sendRidingPacket(entity.getEntityId(), passengerIDs, outsideViewers); @@ -118,7 +118,7 @@ public class UserBackpackManager { } public void hideBackpack() { - if (user.getHidden()) return; + if (user.isHidden()) return; //getArmorStand().getEquipment().clear(); backpackHidden = true; } diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java index 3cfbaccc..c9edf170 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserBalloonManager.java @@ -205,7 +205,7 @@ public class UserBalloonManager { CosmeticUser viewer = CosmeticUsers.getUser(player.getUniqueId()); if (user.getPlayer() == player) { - return (!user.getHidden()); + return (!user.isHidden()); } else { if (user.isInWardrobe()) return false; MessagesUtil.sendDebugMessages("playerCheck - Not Same Player"); @@ -214,6 +214,6 @@ public class UserBalloonManager { return false; } } - return (!user.getHidden()); + return (!user.isHidden()); } }