From 261d571be17643aa6830c777ad866134f02f0e50 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Wed, 13 Feb 2019 09:02:30 -0800 Subject: [PATCH] expanding the abstraction (this is going to happen a lot) --- .../commands/party/PartyDisbandCommand.java | 2 +- .../commands/party/PartyKickCommand.java | 2 +- .../commands/party/PartyQuitCommand.java | 2 +- .../commands/party/PartyRenameCommand.java | 2 +- .../nossr50/listeners/BlockListener.java | 4 +-- .../nossr50/listeners/EntityListener.java | 6 ++--- .../nossr50/listeners/InventoryListener.java | 2 +- .../gmail/nossr50/listeners/SelfListener.java | 6 ++--- .../com/gmail/nossr50/core/McmmoCore.java | 14 ++++++++++ .../nossr50/core/chat/AdminChatManager.java | 9 +++---- .../gmail/nossr50/core/chat/ChatManager.java | 14 +++++----- .../core/datatypes/player/McMMOPlayer.java | 2 +- .../events/chat/McMMOAdminChatEvent.java | 2 +- .../core}/events/chat/McMMOChatEvent.java | 2 +- .../events/chat/McMMOPartyChatEvent.java | 2 +- .../McMMOPlayerExperienceEvent.java | 2 +- .../McMMOPlayerLevelChangeEvent.java | 2 +- .../experience/McMMOPlayerLevelDownEvent.java | 2 +- .../experience/McMMOPlayerLevelUpEvent.java | 2 +- .../experience/McMMOPlayerXpGainEvent.java | 2 +- .../events/fake/FakeBlockBreakEvent.java | 2 +- .../events/fake/FakeBlockDamageEvent.java | 2 +- .../core}/events/fake/FakeBrewEvent.java | 2 +- .../fake/FakeEntityDamageByEntityEvent.java | 2 +- .../events/fake/FakeEntityDamageEvent.java | 2 +- .../events/fake/FakeEntityTameEvent.java | 2 +- .../events/fake/FakePlayerAnimationEvent.java | 2 +- .../events/fake/FakePlayerFishEvent.java | 2 +- .../McMMOPlayerDeathPenaltyEvent.java | 2 +- .../McMMOPlayerPreDeathPenaltyEvent.java | 2 +- .../hardcore/McMMOPlayerStatLossEvent.java | 2 +- .../hardcore/McMMOPlayerVampirismEvent.java | 2 +- .../events/items/McMMOItemSpawnEvent.java | 2 +- .../party/McMMOPartyAllianceChangeEvent.java | 2 +- .../events/party/McMMOPartyChangeEvent.java | 2 +- .../events/party/McMMOPartyLevelUpEvent.java | 2 +- .../events/party/McMMOPartyTeleportEvent.java | 2 +- .../events/party/McMMOPartyXpGainEvent.java | 2 +- .../scoreboard/McMMOScoreboardEvent.java | 2 +- .../McMMOScoreboardMakeboardEvent.java | 2 +- .../McMMOScoreboardObjectiveEvent.java | 2 +- .../McMMOScoreboardRevertEvent.java | 2 +- .../scoreboard/ScoreboardEventReason.java | 2 +- .../ScoreboardObjectiveEventReason.java | 2 +- .../skills/McMMOPlayerNotificationEvent.java | 2 +- .../events/skills/McMMOPlayerSkillEvent.java | 2 +- .../McMMOPlayerAbilityActivateEvent.java | 2 +- .../McMMOPlayerAbilityDeactivateEvent.java | 2 +- .../abilities/McMMOPlayerAbilityEvent.java | 4 +-- .../skills/alchemy/McMMOPlayerBrewEvent.java | 4 +-- .../alchemy/McMMOPlayerCatalysisEvent.java | 4 +-- .../fishing/McMMOPlayerFishingEvent.java | 4 +-- .../McMMOPlayerFishingTreasureEvent.java | 2 +- .../fishing/McMMOPlayerMagicHunterEvent.java | 2 +- .../skills/fishing/McMMOPlayerShakeEvent.java | 2 +- .../repair/McMMOPlayerRepairCheckEvent.java | 4 +-- .../salvage/McMMOPlayerSalvageCheckEvent.java | 4 +-- .../secondaryabilities/SubSkillEvent.java | 4 +-- .../SubSkillRandomCheckEvent.java | 2 +- .../unarmed/McMMOPlayerDisarmEvent.java | 4 +-- .../nossr50/core/mcmmo/colors/Color.java | 2 +- .../nossr50/core/mcmmo/entity/Player.java | 3 ++- .../nossr50/core/mcmmo/entity/Tameable.java | 2 +- .../core/mcmmo/event/EventCommander.java | 10 +++++++ .../core/mcmmo/permissions/Permissible.java | 13 +++++++++ .../nossr50/core/mcmmo/server/Server.java | 27 +++++++++++++++++++ .../nossr50/core/skills/PrimarySkillType.java | 7 +++-- .../nossr50/core/skills/SuperAbilityType.java | 11 ++++---- .../gmail/nossr50/core/util/Permissions.java | 12 ++------- 69 files changed, 158 insertions(+), 106 deletions(-) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/chat/McMMOAdminChatEvent.java (91%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/chat/McMMOChatEvent.java (98%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/chat/McMMOPartyChatEvent.java (94%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/experience/McMMOPlayerExperienceEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/experience/McMMOPlayerLevelChangeEvent.java (92%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/experience/McMMOPlayerLevelDownEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/experience/McMMOPlayerLevelUpEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/experience/McMMOPlayerXpGainEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakeBlockBreakEvent.java (88%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakeBlockDamageEvent.java (91%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakeBrewEvent.java (87%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakeEntityDamageByEntityEvent.java (96%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakeEntityDamageEvent.java (96%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakeEntityTameEvent.java (89%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakePlayerAnimationEvent.java (87%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/fake/FakePlayerFishEvent.java (89%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/hardcore/McMMOPlayerDeathPenaltyEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java (95%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/hardcore/McMMOPlayerStatLossEvent.java (87%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/hardcore/McMMOPlayerVampirismEvent.java (91%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/items/McMMOItemSpawnEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/party/McMMOPartyAllianceChangeEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/party/McMMOPartyChangeEvent.java (98%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/party/McMMOPartyLevelUpEvent.java (96%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/party/McMMOPartyTeleportEvent.java (96%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/party/McMMOPartyXpGainEvent.java (97%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/scoreboard/McMMOScoreboardEvent.java (98%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/scoreboard/McMMOScoreboardMakeboardEvent.java (93%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/scoreboard/McMMOScoreboardObjectiveEvent.java (96%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/scoreboard/McMMOScoreboardRevertEvent.java (93%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/scoreboard/ScoreboardEventReason.java (67%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/scoreboard/ScoreboardObjectiveEventReason.java (68%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/McMMOPlayerNotificationEvent.java (98%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/McMMOPlayerSkillEvent.java (96%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java (90%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java (84%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/abilities/McMMOPlayerAbilityEvent.java (79%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/alchemy/McMMOPlayerBrewEvent.java (88%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/alchemy/McMMOPlayerCatalysisEvent.java (86%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/fishing/McMMOPlayerFishingEvent.java (81%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java (92%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/fishing/McMMOPlayerMagicHunterEvent.java (91%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/fishing/McMMOPlayerShakeEvent.java (88%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/repair/McMMOPlayerRepairCheckEvent.java (92%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java (92%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/secondaryabilities/SubSkillEvent.java (91%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java (95%) rename {bukkit/src/main/java/com/gmail/nossr50 => core/src/main/java/com/gmail/nossr50/core}/events/skills/unarmed/McMMOPlayerDisarmEvent.java (85%) create mode 100644 core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventCommander.java create mode 100644 core/src/main/java/com/gmail/nossr50/core/mcmmo/permissions/Permissible.java create mode 100644 core/src/main/java/com/gmail/nossr50/core/mcmmo/server/Server.java diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java index 6001a512e..0a740f02e 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java +++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java @@ -4,7 +4,7 @@ import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.party.PartyManager; -import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; +import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java index 7b969845d..51115f9f5 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java +++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.party.PartyManager; import com.gmail.nossr50.core.util.commands.CommandUtils; -import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; +import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.mcMMO; import org.bukkit.OfflinePlayer; import org.bukkit.command.Command; diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java index 2097451c4..dfd6afe19 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java +++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.party.PartyManager; -import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; +import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java index 802f1797e..1db6a2fec 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java +++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java @@ -5,7 +5,7 @@ import com.gmail.nossr50.core.datatypes.party.Party; import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.party.PartyManager; -import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; +import com.gmail.nossr50.core.events.party.McMMOPartyChangeEvent.EventReason; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java index 515dcdf64..f21e36b17 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java +++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java @@ -26,8 +26,8 @@ import com.gmail.nossr50.core.util.sounds.SoundManager; import com.gmail.nossr50.core.util.sounds.SoundType; import com.gmail.nossr50.core.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardUtils; -import com.gmail.nossr50.events.fake.FakeBlockBreakEvent; -import com.gmail.nossr50.events.fake.FakeBlockDamageEvent; +import com.gmail.nossr50.core.events.fake.FakeBlockBreakEvent; +import com.gmail.nossr50.core.events.fake.FakeBlockDamageEvent; import com.gmail.nossr50.mcMMO; import org.bukkit.GameMode; import org.bukkit.Location; diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 20e14784c..9e4bb2e14 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -22,9 +22,9 @@ import com.gmail.nossr50.core.util.Permissions; import com.gmail.nossr50.core.util.skills.CombatUtils; import com.gmail.nossr50.core.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardUtils; -import com.gmail.nossr50.events.fake.FakeEntityDamageByEntityEvent; -import com.gmail.nossr50.events.fake.FakeEntityDamageEvent; -import com.gmail.nossr50.events.fake.FakeEntityTameEvent; +import com.gmail.nossr50.core.events.fake.FakeEntityDamageByEntityEvent; +import com.gmail.nossr50.core.events.fake.FakeEntityDamageEvent; +import com.gmail.nossr50.core.events.fake.FakeEntityTameEvent; import com.gmail.nossr50.mcMMO; import org.bukkit.Material; import org.bukkit.OfflinePlayer; diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index 0be341eef..02069c47a 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -13,7 +13,7 @@ import com.gmail.nossr50.core.util.Permissions; import com.gmail.nossr50.core.util.skills.SkillUtils; import com.gmail.nossr50.core.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardUtils; -import com.gmail.nossr50.events.fake.FakeBrewEvent; +import com.gmail.nossr50.core.events.fake.FakeBrewEvent; import com.gmail.nossr50.mcMMO; import org.bukkit.Location; import org.bukkit.Material; diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java index 74d2d1939..bb83c1340 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java +++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java @@ -9,9 +9,9 @@ import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager; import com.gmail.nossr50.core.worldguard.WorldGuardManager; import com.gmail.nossr50.core.worldguard.WorldGuardUtils; -import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent; -import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent; -import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent; +import com.gmail.nossr50.core.events.experience.McMMOPlayerLevelUpEvent; +import com.gmail.nossr50.core.events.experience.McMMOPlayerXpGainEvent; +import com.gmail.nossr50.core.events.skills.abilities.McMMOPlayerAbilityActivateEvent; import com.gmail.nossr50.mcMMO; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/core/src/main/java/com/gmail/nossr50/core/McmmoCore.java b/core/src/main/java/com/gmail/nossr50/core/McmmoCore.java index 885aa7db2..09aaa8389 100644 --- a/core/src/main/java/com/gmail/nossr50/core/McmmoCore.java +++ b/core/src/main/java/com/gmail/nossr50/core/McmmoCore.java @@ -1,11 +1,17 @@ package com.gmail.nossr50.core; +import com.gmail.nossr50.core.mcmmo.event.EventCommander; import com.gmail.nossr50.core.mcmmo.plugin.Plugin; +import com.gmail.nossr50.core.mcmmo.server.Server; import java.util.logging.Logger; public class McmmoCore { + //TODO: Wire all this stuff public static Plugin p; + private static EventCommander eventCommander; + private static Server server; + private static Logger logger; /** * Returns our Logger @@ -13,6 +19,14 @@ public class McmmoCore { */ public static Logger getLogger() { + return logger; + } + public static EventCommander getEventCommander() { + return eventCommander; + } + + public static Server getServer() { + return server; } } diff --git a/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java b/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java index bc8e3a5c0..d016c622c 100644 --- a/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java @@ -1,17 +1,16 @@ package com.gmail.nossr50.core.chat; import com.gmail.nossr50.core.config.Config; -import com.gmail.nossr50.events.chat.McMMOAdminChatEvent; -import org.bukkit.plugin.Plugin; +import com.gmail.nossr50.core.events.chat.McMMOAdminChatEvent; public class AdminChatManager extends ChatManager { - protected AdminChatManager(Plugin plugin) { - super(plugin, Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix()); + protected AdminChatManager() { + super(Config.getInstance().getAdminDisplayNames(), Config.getInstance().getAdminChatPrefix()); } @Override public void handleChat(String senderName, String displayName, String message, boolean isAsync) { - handleChat(new McMMOAdminChatEvent(plugin, senderName, displayName, message, isAsync)); + handleChat(new McMMOAdminChatEvent(senderName, displayName, message, isAsync)); } @Override diff --git a/core/src/main/java/com/gmail/nossr50/core/chat/ChatManager.java b/core/src/main/java/com/gmail/nossr50/core/chat/ChatManager.java index 92bfc7067..373a96c5a 100644 --- a/core/src/main/java/com/gmail/nossr50/core/chat/ChatManager.java +++ b/core/src/main/java/com/gmail/nossr50/core/chat/ChatManager.java @@ -1,15 +1,14 @@ package com.gmail.nossr50.core.chat; +import com.gmail.nossr50.core.McmmoCore; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.party.Party; +import com.gmail.nossr50.core.events.chat.McMMOChatEvent; +import com.gmail.nossr50.core.events.chat.McMMOPartyChatEvent; import com.gmail.nossr50.core.locale.LocaleLoader; -import com.gmail.nossr50.events.chat.McMMOChatEvent; -import com.gmail.nossr50.events.chat.McMMOPartyChatEvent; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; +import com.gmail.nossr50.core.mcmmo.entity.Player; public abstract class ChatManager { - protected Plugin plugin; protected boolean useDisplayNames; protected String chatPrefix; @@ -17,14 +16,13 @@ public abstract class ChatManager { protected String displayName; protected String message; - protected ChatManager(Plugin plugin, boolean useDisplayNames, String chatPrefix) { - this.plugin = plugin; + protected ChatManager(boolean useDisplayNames, String chatPrefix) { this.useDisplayNames = useDisplayNames; this.chatPrefix = chatPrefix; } protected void handleChat(McMMOChatEvent event) { - plugin.getServer().getPluginManager().callEvent(event); + McmmoCore.getEventCommander().callEvent(event); if (event.isCancelled()) { return; diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java index 16de62109..47cf36dd1 100644 --- a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java +++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java @@ -147,7 +147,7 @@ public class McMMOPlayer { } public void processUnlockNotifications(PrimarySkillType primarySkillType, int skillLevel) { - RankUtils.executeSkillUnlockNotifications(primarySkillType, skillLevel); + RankUtils.executeSkillUnlockNotifications(this, primarySkillType, skillLevel); } public void updateXPBar(PrimarySkillType primarySkillType) { diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOAdminChatEvent.java similarity index 91% rename from bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOAdminChatEvent.java index 089a5917f..b307904b1 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOAdminChatEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.chat; +package com.gmail.nossr50.core.events.chat; import org.bukkit.plugin.Plugin; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOChatEvent.java similarity index 98% rename from bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOChatEvent.java index ce13caf12..7708d2a47 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOChatEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.chat; +package com.gmail.nossr50.core.events.chat; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java similarity index 94% rename from bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java index ffa54f815..970ce811e 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/chat/McMMOPartyChatEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.chat; +package com.gmail.nossr50.core.events.chat; import org.bukkit.plugin.Plugin; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java index a19cc810d..247f8d3c4 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerExperienceEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.experience; +package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java similarity index 92% rename from bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java index 316c1c6d4..3c769a19c 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelChangeEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.experience; +package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.skills.PrimarySkillType; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java index 183cced08..b153d2c1f 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelDownEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.experience; +package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.skills.PrimarySkillType; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java index 1dd843d7e..342c5479a 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerLevelUpEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.experience; +package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.skills.PrimarySkillType; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java index c3290569d..3c5febfb2 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/experience/McMMOPlayerXpGainEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.experience; +package com.gmail.nossr50.core.events.experience; import com.gmail.nossr50.core.datatypes.experience.XPGainReason; import com.gmail.nossr50.core.skills.PrimarySkillType; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java similarity index 88% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java index 7a2f7ab08..11892986c 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockBreakEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java similarity index 91% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java index 31dbb7a53..06442f1c8 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBlockDamageEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java similarity index 87% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java index e7ef73c3e..f50ef5574 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeBrewEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import org.bukkit.block.Block; import org.bukkit.event.inventory.BrewEvent; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java similarity index 96% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java index 840f039f6..5776eee32 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageByEntityEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import com.google.common.base.Function; import com.google.common.base.Functions; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java similarity index 96% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java index 0ec008672..ff0b2fd58 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityDamageEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import com.google.common.base.Function; import com.google.common.base.Functions; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java similarity index 89% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java index 46adfe737..078a866fc 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakeEntityTameEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import org.bukkit.entity.AnimalTamer; import org.bukkit.entity.LivingEntity; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java similarity index 87% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java index c6e2cbaab..61263c64f 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerAnimationEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerAnimationEvent; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java similarity index 89% rename from bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java index 235af9934..746c03abc 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/fake/FakePlayerFishEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.fake; +package com.gmail.nossr50.core.events.fake; import org.bukkit.entity.Entity; import org.bukkit.entity.FishHook; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java index a6035351c..212b21b63 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerDeathPenaltyEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.hardcore; +package com.gmail.nossr50.core.events.hardcore; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java similarity index 95% rename from bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java index 7e8b8fb22..6093ecf3f 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.hardcore; +package com.gmail.nossr50.core.events.hardcore; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java similarity index 87% rename from bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java index 414ffdac5..158390b13 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerStatLossEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.hardcore; +package com.gmail.nossr50.core.events.hardcore; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java similarity index 91% rename from bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java index 735094f67..f7162b8fb 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/hardcore/McMMOPlayerVampirismEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.hardcore; +package com.gmail.nossr50.core.events.hardcore; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java index 5756fe5fe..d4790bb89 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/items/McMMOItemSpawnEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.items; +package com.gmail.nossr50.core.events.items; import org.bukkit.Location; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java index 4a57ca955..6d3f7a419 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyAllianceChangeEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.party; +package com.gmail.nossr50.core.events.party; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java similarity index 98% rename from bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java index 00fea8f2c..24b200218 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyChangeEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.party; +package com.gmail.nossr50.core.events.party; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java similarity index 96% rename from bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java index 78ade045c..4e70108fa 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyLevelUpEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.party; +package com.gmail.nossr50.core.events.party; import com.gmail.nossr50.core.datatypes.party.Party; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java similarity index 96% rename from bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java index 7139e3264..9be1111ad 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyTeleportEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.party; +package com.gmail.nossr50.core.events.party; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java similarity index 97% rename from bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java index 2854ac512..234721ffe 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/party/McMMOPartyXpGainEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.party; +package com.gmail.nossr50.core.events.party; import com.gmail.nossr50.core.datatypes.party.Party; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java similarity index 98% rename from bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java index b7b608716..2246c8b2e 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.scoreboard; +package com.gmail.nossr50.core.events.scoreboard; import org.bukkit.entity.Player; import org.bukkit.event.Event; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java similarity index 93% rename from bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java index 8418e0ad8..4d8ffec8d 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardMakeboardEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.scoreboard; +package com.gmail.nossr50.core.events.scoreboard; import org.bukkit.entity.Player; import org.bukkit.scoreboard.Scoreboard; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java similarity index 96% rename from bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java index 41ffb01a2..fe471604a 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardObjectiveEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.scoreboard; +package com.gmail.nossr50.core.events.scoreboard; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java similarity index 93% rename from bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java index 000a19a54..dbe261e91 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/McMMOScoreboardRevertEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.scoreboard; +package com.gmail.nossr50.core.events.scoreboard; import org.bukkit.entity.Player; import org.bukkit.scoreboard.Scoreboard; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/ScoreboardEventReason.java similarity index 67% rename from bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java rename to core/src/main/java/com/gmail/nossr50/core/events/scoreboard/ScoreboardEventReason.java index 6fe31c898..7097e0f8c 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/ScoreboardEventReason.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.scoreboard; +package com.gmail.nossr50.core.events.scoreboard; public enum ScoreboardEventReason { CREATING_NEW_SCOREBOARD, diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/ScoreboardObjectiveEventReason.java similarity index 68% rename from bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java rename to core/src/main/java/com/gmail/nossr50/core/events/scoreboard/ScoreboardObjectiveEventReason.java index 0f0cda63c..eb11d3b8a 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/scoreboard/ScoreboardObjectiveEventReason.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.scoreboard; +package com.gmail.nossr50.core.events.scoreboard; public enum ScoreboardObjectiveEventReason { UNREGISTER_THIS_OBJECTIVE, diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java similarity index 98% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java index 046eb65d8..02564d84a 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerNotificationEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills; +package com.gmail.nossr50.core.events.skills; import com.gmail.nossr50.core.datatypes.interactions.NotificationType; import net.md_5.bungee.api.ChatMessageType; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java similarity index 96% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java index 0bcafac90..4ddc9ffb1 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/McMMOPlayerSkillEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills; +package com.gmail.nossr50.core.events.skills; import com.gmail.nossr50.core.data.UserManager; import com.gmail.nossr50.core.skills.PrimarySkillType; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java similarity index 90% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java index baf52c70f..241b669ee 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills.abilities; +package com.gmail.nossr50.core.events.skills.abilities; import com.gmail.nossr50.core.skills.PrimarySkillType; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java similarity index 84% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java index b2f85065e..e1c6a2d64 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills.abilities; +package com.gmail.nossr50.core.events.skills.abilities; import com.gmail.nossr50.core.skills.PrimarySkillType; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java similarity index 79% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java index b082af019..1ff35b90a 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/abilities/McMMOPlayerAbilityEvent.java @@ -1,8 +1,8 @@ -package com.gmail.nossr50.events.skills.abilities; +package com.gmail.nossr50.core.events.skills.abilities; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SuperAbilityType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; public class McMMOPlayerAbilityEvent extends McMMOPlayerSkillEvent { diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java similarity index 88% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java index f240b10e6..1a1ec0d19 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerBrewEvent.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.events.skills.alchemy; +package com.gmail.nossr50.core.events.skills.alchemy; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.BrewingStand; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java similarity index 86% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java index 0afe839bb..499b9fc7f 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/alchemy/McMMOPlayerCatalysisEvent.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.events.skills.alchemy; +package com.gmail.nossr50.core.events.skills.alchemy; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java similarity index 81% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java index 215627eb5..981573842 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingEvent.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.events.skills.fishing; +package com.gmail.nossr50.core.events.skills.fishing; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java similarity index 92% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java index dba01b751..a5c0d5dd3 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills.fishing; +package com.gmail.nossr50.core.events.skills.fishing; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java similarity index 91% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java index 8c993b5a4..017fc0d41 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerMagicHunterEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills.fishing; +package com.gmail.nossr50.core.events.skills.fishing; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java similarity index 88% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java index 0953569e4..74ba47e16 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/fishing/McMMOPlayerShakeEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills.fishing; +package com.gmail.nossr50.core.events.skills.fishing; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java similarity index 92% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java index 1ce52a60c..651a1b18b 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/repair/McMMOPlayerRepairCheckEvent.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.events.skills.repair; +package com.gmail.nossr50.core.events.skills.repair; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.inventory.ItemStack; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java similarity index 92% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java index 7a379de9d..c988212ad 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.events.skills.salvage; +package com.gmail.nossr50.core.events.skills.salvage; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.inventory.ItemStack; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java similarity index 91% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java index 3cbb74d4b..507b9cefd 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillEvent.java @@ -1,9 +1,9 @@ -package com.gmail.nossr50.events.skills.secondaryabilities; +package com.gmail.nossr50.core.events.skills.secondaryabilities; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java similarity index 95% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java index 2815cbfa4..6e463eafc 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50.events.skills.secondaryabilities; +package com.gmail.nossr50.core.events.skills.secondaryabilities; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; diff --git a/bukkit/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java b/core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java similarity index 85% rename from bukkit/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java rename to core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java index e401c1382..0c492684d 100644 --- a/bukkit/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java +++ b/core/src/main/java/com/gmail/nossr50/core/events/skills/unarmed/McMMOPlayerDisarmEvent.java @@ -1,7 +1,7 @@ -package com.gmail.nossr50.events.skills.unarmed; +package com.gmail.nossr50.core.events.skills.unarmed; import com.gmail.nossr50.core.skills.PrimarySkillType; -import com.gmail.nossr50.events.skills.McMMOPlayerSkillEvent; +import com.gmail.nossr50.core.events.skills.McMMOPlayerSkillEvent; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/colors/Color.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/colors/Color.java index e7b045a3f..b44a0b812 100644 --- a/core/src/main/java/com/gmail/nossr50/core/mcmmo/colors/Color.java +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/colors/Color.java @@ -25,6 +25,6 @@ public enum Color { Color fromRGB(int r, int g, int b) { - + //TODO: Figure this out later } } diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java index 2e8cf8edd..8ecb7bafd 100644 --- a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java @@ -4,11 +4,12 @@ import com.gmail.nossr50.core.datatypes.player.McMMOPlayer; import com.gmail.nossr50.core.mcmmo.Nameable; import com.gmail.nossr50.core.mcmmo.inventory.InventoryHolder; import com.gmail.nossr50.core.mcmmo.item.ItemStack; +import com.gmail.nossr50.core.mcmmo.permissions.Permissible; /** * Players */ -public interface Player extends Living, Nameable, InventoryHolder { +public interface Player extends Living, Nameable, InventoryHolder, Permissible { /** * Players are not always online diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Tameable.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Tameable.java index 63e008789..168784877 100644 --- a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Tameable.java +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Tameable.java @@ -4,5 +4,5 @@ package com.gmail.nossr50.core.mcmmo.entity; * Represents an entity that can be tamed */ public interface Tameable extends Living { - + } diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventCommander.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventCommander.java new file mode 100644 index 000000000..959da1499 --- /dev/null +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventCommander.java @@ -0,0 +1,10 @@ +package com.gmail.nossr50.core.mcmmo.event; + +public interface EventCommander { + /** + * Calls an event + * @param event the event to call + * @return the event after it has been passed around + */ + Event callEvent(Event event); +} diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/permissions/Permissible.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/permissions/Permissible.java new file mode 100644 index 000000000..6c8a32a80 --- /dev/null +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/permissions/Permissible.java @@ -0,0 +1,13 @@ +package com.gmail.nossr50.core.mcmmo.permissions; + +/** + * A thing that can have Permissions is a Permissible + */ +public interface Permissible { + /** + * Returns whether or not this Permissible has this permission + * @param path the permission nodes full path + * @return true if the permissible has this permission + */ + boolean hasPermission(String path); +} diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/server/Server.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/server/Server.java new file mode 100644 index 000000000..fd6a4a43e --- /dev/null +++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/server/Server.java @@ -0,0 +1,27 @@ +package com.gmail.nossr50.core.mcmmo.server; + +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.world.World; + +/** + * Represents the server and its state + */ +public interface Server { + /** + * Broadcasts a msg to every player on the server + * @param msg the message to broadcast + */ + void broadcast(String msg); + + /** + * Gets the online players for this server + * @return the online players for this server + */ + Player[] getOnlinePlayers(); + + /** + * Gets the worlds for this server + * @return the worlds for this server + */ + World[] getWorlds(); +} diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java b/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java index 5fc7b1dfe..94968880f 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java @@ -1,11 +1,13 @@ package com.gmail.nossr50.core.skills; +import com.gmail.nossr50.core.McmmoCore; import com.gmail.nossr50.core.config.Config; import com.gmail.nossr50.core.config.experience.ExperienceConfig; import com.gmail.nossr50.core.locale.LocaleLoader; import com.gmail.nossr50.core.mcmmo.colors.Color; import com.gmail.nossr50.core.mcmmo.entity.Entity; import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.mcmmo.entity.Tameable; import com.gmail.nossr50.core.skills.child.salvage.SalvageManager; import com.gmail.nossr50.core.skills.child.smelting.SmeltingManager; import com.gmail.nossr50.core.skills.primary.acrobatics.AcrobaticsManager; @@ -26,9 +28,6 @@ import com.gmail.nossr50.core.util.StringUtils; import com.gmail.nossr50.core.util.skills.ParticleEffectUtils; import com.gmail.nossr50.core.util.skills.RankUtils; import com.google.common.collect.ImmutableList; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; -import org.bukkit.entity.Tameable; import java.util.ArrayList; import java.util.Collections; @@ -120,7 +119,7 @@ public enum PrimarySkillType { } if (!skillName.equalsIgnoreCase("all")) { - mcMMO.p.getLogger().warning("Invalid mcMMO skill (" + skillName + ")"); //TODO: Localize + McmmoCore.getLogger().warning("Invalid mcMMO skill (" + skillName + ")"); //TODO: Localize } return null; diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java b/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java index 817127ddd..9f84d67fd 100644 --- a/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java +++ b/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java @@ -1,12 +1,11 @@ package com.gmail.nossr50.core.skills; import com.gmail.nossr50.core.config.Config; -import com.gmail.nossr50.util.BlockUtils; -import com.gmail.nossr50.util.Permissions; -import com.gmail.nossr50.util.StringUtils; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.entity.Player; +import com.gmail.nossr50.core.mcmmo.block.BlockState; +import com.gmail.nossr50.core.mcmmo.entity.Player; +import com.gmail.nossr50.core.util.BlockUtils; +import com.gmail.nossr50.core.util.Permissions; +import com.gmail.nossr50.core.util.StringUtils; public enum SuperAbilityType { BERSERK( diff --git a/core/src/main/java/com/gmail/nossr50/core/util/Permissions.java b/core/src/main/java/com/gmail/nossr50/core/util/Permissions.java index addbe21df..0055051bb 100644 --- a/core/src/main/java/com/gmail/nossr50/core/util/Permissions.java +++ b/core/src/main/java/com/gmail/nossr50/core/util/Permissions.java @@ -1,20 +1,12 @@ package com.gmail.nossr50.core.util; -import com.gmail.nossr50.commands.party.PartySubcommandType; +import com.gmail.nossr50.core.mcmmo.permissions.Permissible; +import com.gmail.nossr50.core.mcmmo.world.World; import com.gmail.nossr50.core.skills.ItemType; import com.gmail.nossr50.core.skills.MaterialType; import com.gmail.nossr50.core.skills.PrimarySkillType; import com.gmail.nossr50.core.skills.SubSkillType; import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill; -import com.gmail.nossr50.mcMMO; -import org.bukkit.Material; -import org.bukkit.Server; -import org.bukkit.World; -import org.bukkit.entity.EntityType; -import org.bukkit.permissions.Permissible; -import org.bukkit.permissions.Permission; -import org.bukkit.permissions.PermissionDefault; -import org.bukkit.plugin.PluginManager; public final class Permissions { private Permissions() {