Reorganize the communities package

It was kinda stressing me out
This commit is contained in:
Dan Mulloy 2018-06-10 21:08:34 -04:00 committed by Alexander Meech
parent 9da4abf235
commit 9b83566605
29 changed files with 96 additions and 80 deletions

View File

@ -41,6 +41,13 @@ import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.communities.Community.PrivacySetting;
import mineplex.core.communities.commands.CommunityCommand;
import mineplex.core.communities.events.CommunityBrowserUpdateEvent;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
import mineplex.core.communities.events.CommunityNameUpdateEvent;
import mineplex.core.communities.events.CommunitySettingUpdateEvent;
import mineplex.core.communities.redis.CommunityChat;
import mineplex.core.communities.redis.CommunityChatHandler;
import mineplex.core.communities.redis.CommunityCloseJoinRequest;
@ -65,7 +72,6 @@ import mineplex.core.communities.redis.CommunityUpdateName;
import mineplex.core.communities.redis.CommunityUpdateNameHandler;
import mineplex.core.communities.redis.CommunityUpdateSetting;
import mineplex.core.communities.redis.CommunityUpdateSettingHandler;
import mineplex.core.communities.storage.CommunityRepository;
import mineplex.core.customdata.CustomDataManager;
import mineplex.core.preferences.Preference;
import mineplex.core.preferences.PreferencesManager;

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.storage;
package mineplex.core.communities;
import java.sql.Connection;
import java.sql.SQLException;

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.mcs;
package mineplex.core.communities;
import org.bukkit.Material;

View File

@ -8,8 +8,8 @@ import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityManager;
import mineplex.core.communities.gui.community.CommunityMembersPage;
import mineplex.core.communities.gui.overview.CommunityOverviewPage;
import mineplex.core.communities.gui.pages.CommunityMembersPage;
import mineplex.core.communities.gui.pages.CommunityOverviewPage;
public class CommunityCommand extends MultiCommandBase<CommunityManager>
{

View File

@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
import mineplex.core.command.CommandBase;
import mineplex.core.communities.CommunityManager;
import mineplex.core.communities.gui.overview.CommunityOverviewPage;
import mineplex.core.communities.gui.pages.CommunityOverviewPage;
public class CommunityMenuCommand extends CommandBase<CommunityManager>
{

View File

@ -1,4 +1,4 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;

View File

@ -1,8 +1,10 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import mineplex.core.communities.Community;
public class CommunityDisbandEvent extends Event
{
private static final HandlerList handlers = new HandlerList();

View File

@ -1,8 +1,10 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import mineplex.core.communities.Community;
public class CommunityJoinRequestsUpdateEvent extends Event
{
private static final HandlerList handlers = new HandlerList();

View File

@ -1,4 +1,4 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;

View File

@ -1,8 +1,10 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import mineplex.core.communities.Community;
public class CommunityMembershipUpdateEvent extends Event
{
private static final HandlerList handlers = new HandlerList();

View File

@ -1,8 +1,10 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import mineplex.core.communities.Community;
public class CommunityNameUpdateEvent extends Event
{
private static final HandlerList handlers = new HandlerList();

View File

@ -1,8 +1,10 @@
package mineplex.core.communities;
package mineplex.core.communities.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import mineplex.core.communities.Community;
public class CommunitySettingUpdateEvent extends Event
{
private static final HandlerList handlers = new HandlerList();

View File

@ -1,9 +1,10 @@
package mineplex.core.communities.gui;
package mineplex.core.communities.gui.buttons;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.Callback;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
public class ActionButton extends CommunitiesGUIButton
{

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui;
package mineplex.core.communities.gui.buttons;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.browser;
package mineplex.core.communities.gui.buttons;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
@ -8,8 +8,8 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
import mineplex.core.communities.Community;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.community.CommunityMembersPage;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.communities.gui.pages.CommunityMembersPage;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityBrowserButton extends CommunitiesGUIButton

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.buttons;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -13,7 +13,7 @@ import mineplex.core.common.util.UtilText;
import mineplex.core.communities.Community;
import mineplex.core.communities.Community.PrivacySetting;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityButton extends CommunitiesGUIButton

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.buttons;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -7,7 +7,7 @@ import org.bukkit.inventory.ItemStack;
import mineplex.core.common.util.C;
import mineplex.core.communities.Community;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityChatReadingButton extends CommunitiesGUIButton

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.buttons;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
@ -6,7 +6,7 @@ import org.bukkit.event.inventory.ClickType;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityJoinRequestInfo;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
public class CommunityJoinRequestButton extends CommunitiesGUIButton
{

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.buttons;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
@ -11,7 +11,7 @@ import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityManager;
import mineplex.core.communities.CommunityMemberInfo;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
public class CommunityMemberButton extends CommunitiesGUIButton
{

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.buttons;
import java.util.Arrays;
import java.util.HashMap;
@ -17,7 +17,7 @@ import mineplex.core.communities.Community;
import mineplex.core.communities.Community.PrivacySetting;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.CommunitySetting;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.game.GameDisplay;
import mineplex.core.itemstack.ItemBuilder;

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.overview;
package mineplex.core.communities.gui.buttons;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -9,8 +9,8 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
import mineplex.core.communities.Community;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.community.CommunityMembersPage;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.communities.gui.pages.CommunityMembersPage;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityVisualizationButton extends CommunitiesGUIButton

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui;
package mineplex.core.communities.gui.pages;
import java.util.HashMap;
import java.util.Map;
@ -14,6 +14,7 @@ import org.bukkit.inventory.Inventory;
import mineplex.core.Managers;
import mineplex.core.common.util.UtilServer;
import mineplex.core.communities.CommunityManager;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.browser;
package mineplex.core.communities.gui.pages;
import java.util.ArrayList;
import java.util.List;
@ -8,13 +8,11 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.communities.CommunityBrowserUpdateEvent;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityBrowserUpdateEvent;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.CommunityManager;
import mineplex.core.communities.gui.ActionButton;
import mineplex.core.communities.gui.CommunitiesGUIPage;
import mineplex.core.communities.gui.overview.CommunityInvitesPage;
import mineplex.core.communities.gui.overview.CommunityOverviewPage;
import mineplex.core.communities.gui.buttons.CommunityBrowserButton;
import mineplex.core.communities.gui.buttons.ActionButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityBrowserPage extends CommunitiesGUIPage

View File

@ -1,15 +1,14 @@
package mineplex.core.communities.gui.overview;
package mineplex.core.communities.gui.pages;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.gui.ActionButton;
import mineplex.core.communities.gui.CommunitiesGUIPage;
import mineplex.core.communities.gui.browser.CommunityBrowserPage;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.gui.buttons.ActionButton;
import mineplex.core.communities.gui.buttons.CommunityVisualizationButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityInvitesPage extends CommunitiesGUIPage

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.pages;
import java.util.LinkedList;
import java.util.List;
@ -9,15 +9,16 @@ import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.CommunityJoinRequestInfo;
import mineplex.core.communities.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.CommunityMembershipUpdateEvent;
import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.gui.ActionButton;
import mineplex.core.communities.gui.CommunitiesGUIPage;
import mineplex.core.communities.gui.overview.CommunityOverviewPage;
import mineplex.core.communities.gui.buttons.ActionButton;
import mineplex.core.communities.gui.buttons.CommunityButton;
import mineplex.core.communities.gui.buttons.CommunityChatReadingButton;
import mineplex.core.communities.gui.buttons.CommunityJoinRequestButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityJoinRequestsPage extends CommunitiesGUIPage

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.pages;
import java.util.LinkedList;
import java.util.List;
@ -9,16 +9,17 @@ import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.CommunityMemberInfo;
import mineplex.core.communities.CommunityMembershipUpdateEvent;
import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.gui.ActionButton;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.CommunitiesGUIPage;
import mineplex.core.communities.gui.overview.CommunityOverviewPage;
import mineplex.core.communities.gui.buttons.ActionButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunityButton;
import mineplex.core.communities.gui.buttons.CommunityChatReadingButton;
import mineplex.core.communities.gui.buttons.CommunityMemberButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityMembersPage extends CommunitiesGUIPage

View File

@ -1,6 +1,5 @@
package mineplex.core.communities.gui.overview;
package mineplex.core.communities.gui.pages;
import java.util.Arrays;
import java.util.List;
import org.bukkit.Material;
@ -9,11 +8,10 @@ import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.gui.ActionButton;
import mineplex.core.communities.gui.CommunitiesGUIPage;
import mineplex.core.communities.gui.browser.CommunityBrowserPage;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.gui.buttons.ActionButton;
import mineplex.core.communities.gui.buttons.CommunityVisualizationButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunityOverviewPage extends CommunitiesGUIPage

View File

@ -1,4 +1,4 @@
package mineplex.core.communities.gui.community;
package mineplex.core.communities.gui.pages;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@ -6,17 +6,18 @@ import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.CommunityMembershipUpdateEvent;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityJoinRequestsUpdateEvent;
import mineplex.core.communities.events.CommunityMemberDataUpdateEvent;
import mineplex.core.communities.events.CommunityMembershipUpdateEvent;
import mineplex.core.communities.CommunityRole;
import mineplex.core.communities.CommunitySetting;
import mineplex.core.communities.CommunitySettingUpdateEvent;
import mineplex.core.communities.gui.ActionButton;
import mineplex.core.communities.gui.CommunitiesGUIButton;
import mineplex.core.communities.gui.CommunitiesGUIPage;
import mineplex.core.communities.gui.overview.CommunityOverviewPage;
import mineplex.core.communities.events.CommunitySettingUpdateEvent;
import mineplex.core.communities.gui.buttons.ActionButton;
import mineplex.core.communities.gui.buttons.CommunitiesGUIButton;
import mineplex.core.communities.gui.buttons.CommunityButton;
import mineplex.core.communities.gui.buttons.CommunityChatReadingButton;
import mineplex.core.communities.gui.buttons.CommunitySettingButton;
import mineplex.core.itemstack.ItemBuilder;
public class CommunitySettingsPage extends CommunitiesGUIPage

View File

@ -42,7 +42,7 @@ import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTextBottom;
import mineplex.core.common.util.UtilTime;
import mineplex.core.communities.Community;
import mineplex.core.communities.CommunityDisbandEvent;
import mineplex.core.communities.events.CommunityDisbandEvent;
import mineplex.core.communities.CommunityManager;
import mineplex.core.communities.CommunityRole;
import mineplex.core.itemstack.ItemStackFactory;