From 684f8a47909c486308d425081cb582923ffedeb3 Mon Sep 17 00:00:00 2001 From: LoJoSho Date: Mon, 19 Jun 2023 13:16:43 -0500 Subject: [PATCH] clean: move events to their own api package --- .../java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java | 2 +- .../hmccosmetics/api/{ => events}/HMCCosmeticSetupEvent.java | 2 +- .../api/{ => events}/PlayerCosmeticEquipEvent.java | 2 +- .../hmccosmetics/api/{ => events}/PlayerCosmeticEvent.java | 2 +- .../api/{ => events}/PlayerCosmeticHideEvent.java | 2 +- .../api/{ => events}/PlayerCosmeticPostEquipEvent.java | 2 +- .../api/{ => events}/PlayerCosmeticRemoveEvent.java | 2 +- .../api/{ => events}/PlayerCosmeticShowEvent.java | 2 +- .../hmccosmetics/api/{ => events}/PlayerEmoteStartEvent.java | 2 +- .../hmccosmetics/api/{ => events}/PlayerEmoteStopEvent.java | 2 +- .../hmccosmetics/api/{ => events}/PlayerMenuCloseEvent.java | 2 +- .../hmccosmetics/api/{ => events}/PlayerMenuEvent.java | 2 +- .../hmccosmetics/api/{ => events}/PlayerMenuOpenEvent.java | 2 +- .../api/{ => events}/PlayerWardrobeEnterEvent.java | 3 +-- .../api/{ => events}/PlayerWardrobeLeaveEvent.java | 2 +- .../src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java | 2 +- .../hibiscusmc/hmccosmetics/listener/PlayerGameListener.java | 3 +-- .../java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java | 2 +- .../hmccosmetics/user/manager/UserEmoteManager.java | 4 ++-- 19 files changed, 20 insertions(+), 22 deletions(-) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/HMCCosmeticSetupEvent.java (90%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerCosmeticEquipEvent.java (97%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerCosmeticEvent.java (92%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerCosmeticHideEvent.java (97%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerCosmeticPostEquipEvent.java (96%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerCosmeticRemoveEvent.java (96%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerCosmeticShowEvent.java (95%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerEmoteStartEvent.java (97%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerEmoteStopEvent.java (97%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerMenuCloseEvent.java (93%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerMenuEvent.java (92%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerMenuOpenEvent.java (96%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerWardrobeEnterEvent.java (93%) rename common/src/main/java/com/hibiscusmc/hmccosmetics/api/{ => events}/PlayerWardrobeLeaveEvent.java (95%) diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java index e88bfcbb..98d07fc6 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/HMCCosmeticsPlugin.java @@ -1,7 +1,7 @@ package com.hibiscusmc.hmccosmetics; import com.bgsoftware.common.config.CommentedConfiguration; -import com.hibiscusmc.hmccosmetics.api.HMCCosmeticSetupEvent; +import com.hibiscusmc.hmccosmetics.api.events.HMCCosmeticSetupEvent; import com.hibiscusmc.hmccosmetics.command.CosmeticCommand; import com.hibiscusmc.hmccosmetics.command.CosmeticCommandTabComplete; import com.hibiscusmc.hmccosmetics.config.DatabaseSettings; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticSetupEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/HMCCosmeticSetupEvent.java similarity index 90% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticSetupEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/HMCCosmeticSetupEvent.java index c5639284..3fb68dba 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/HMCCosmeticSetupEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/HMCCosmeticSetupEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEquipEvent.java similarity index 97% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEquipEvent.java index ed50ed6f..4c8db702 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEquipEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEquipEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java similarity index 92% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java index e0de0218..f4db7e58 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Event; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticHideEvent.java similarity index 97% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticHideEvent.java index 3e5059d8..5276cd35 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticHideEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticHideEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Cancellable; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticPostEquipEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticPostEquipEvent.java similarity index 96% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticPostEquipEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticPostEquipEvent.java index 52fda558..55b93234 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticPostEquipEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticPostEquipEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticRemoveEvent.java similarity index 96% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticRemoveEvent.java index 373337e8..80b47c44 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticRemoveEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticRemoveEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticShowEvent.java similarity index 95% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticShowEvent.java index 4776e432..892b4915 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerCosmeticShowEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerCosmeticShowEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Cancellable; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStartEvent.java similarity index 97% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStartEvent.java index 3d4e4871..5844c489 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStartEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStartEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Cancellable; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStopEvent.java similarity index 97% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStopEvent.java index 4fbb96af..b17a833d 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerEmoteStopEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerEmoteStopEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuCloseEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuCloseEvent.java similarity index 93% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuCloseEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuCloseEvent.java index da43ab9d..dec683bd 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuCloseEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuCloseEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuEvent.java similarity index 92% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuEvent.java index e5b74a2e..001e7ad4 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuOpenEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuOpenEvent.java similarity index 96% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuOpenEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuOpenEvent.java index a31a09d4..dab19418 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerMenuOpenEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerMenuOpenEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.gui.Menu; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeEnterEvent.java similarity index 93% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeEnterEvent.java index f5e39a5b..16e9a25f 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeEnterEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeEnterEvent.java @@ -1,7 +1,6 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.config.Wardrobe; -import com.hibiscusmc.hmccosmetics.config.WardrobeLocation; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeLeaveEvent.java similarity index 95% rename from common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java rename to common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeLeaveEvent.java index affc4945..cd71bf39 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/api/PlayerWardrobeLeaveEvent.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/api/events/PlayerWardrobeLeaveEvent.java @@ -1,4 +1,4 @@ -package com.hibiscusmc.hmccosmetics.api; +package com.hibiscusmc.hmccosmetics.api.events; import com.hibiscusmc.hmccosmetics.user.CosmeticUser; import org.bukkit.event.Cancellable; 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 3e5daaec..f7bfc84e 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/gui/Menu.java @@ -1,7 +1,7 @@ package com.hibiscusmc.hmccosmetics.gui; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; -import com.hibiscusmc.hmccosmetics.api.PlayerMenuOpenEvent; +import com.hibiscusmc.hmccosmetics.api.events.PlayerMenuOpenEvent; import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer; import com.hibiscusmc.hmccosmetics.gui.type.Type; import com.hibiscusmc.hmccosmetics.gui.type.Types; 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 8c97881c..6ca8411f 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/listener/PlayerGameListener.java @@ -9,8 +9,7 @@ import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.wrappers.EnumWrappers; import com.comphenix.protocol.wrappers.Pair; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; -import com.hibiscusmc.hmccosmetics.api.PlayerCosmeticEquipEvent; -import com.hibiscusmc.hmccosmetics.api.PlayerCosmeticPostEquipEvent; +import com.hibiscusmc.hmccosmetics.api.events.PlayerCosmeticPostEquipEvent; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic; import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot; 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 73f781bf..5d6bbcb9 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/CosmeticUser.java @@ -3,7 +3,7 @@ package com.hibiscusmc.hmccosmetics.user; import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin; -import com.hibiscusmc.hmccosmetics.api.*; +import com.hibiscusmc.hmccosmetics.api.events.*; import com.hibiscusmc.hmccosmetics.config.Settings; import com.hibiscusmc.hmccosmetics.config.Wardrobe; import com.hibiscusmc.hmccosmetics.config.WardrobeSettings; diff --git a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java index 2867a7e1..2f5b968a 100644 --- a/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java +++ b/common/src/main/java/com/hibiscusmc/hmccosmetics/user/manager/UserEmoteManager.java @@ -1,7 +1,7 @@ package com.hibiscusmc.hmccosmetics.user.manager; -import com.hibiscusmc.hmccosmetics.api.PlayerEmoteStartEvent; -import com.hibiscusmc.hmccosmetics.api.PlayerEmoteStopEvent; +import com.hibiscusmc.hmccosmetics.api.events.PlayerEmoteStartEvent; +import com.hibiscusmc.hmccosmetics.api.events.PlayerEmoteStopEvent; import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType; import com.hibiscusmc.hmccosmetics.emotes.EmoteManager; import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;