Move Bonus and Poll to core

This commit is contained in:
Shaun Bennett 2015-08-10 01:55:50 -05:00
parent a0be3fa964
commit 6f8d6f8a40
28 changed files with 82 additions and 104 deletions

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses;
package mineplex.core.bonuses;
import java.util.List;

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses;
package mineplex.core.bonuses;
import java.sql.Date;
import java.sql.Timestamp;

View File

@ -1,10 +1,9 @@
package mineplex.hub.bonuses;
package mineplex.core.bonuses;
import java.sql.Date;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Iterator;
import java.util.TimeZone;
import mineplex.core.MiniClientPlugin;
@ -28,21 +27,21 @@ import mineplex.core.hologram.HologramManager;
import mineplex.core.npc.Npc;
import mineplex.core.npc.NpcManager;
import mineplex.core.reward.RewardManager;
import mineplex.core.stats.StatsManager;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.votifier.VotifierCommand;
import mineplex.database.Tables;
import mineplex.hub.bonuses.animations.AnimationCarl;
import mineplex.hub.bonuses.commands.AnimationCommand;
import mineplex.hub.bonuses.commands.GuiCommand;
import mineplex.hub.bonuses.commands.TicketCommand;
import mineplex.hub.bonuses.event.CarlSpinnerEvent;
import mineplex.hub.bonuses.gui.BonusGui;
import mineplex.core.bonuses.animations.AnimationCarl;
import mineplex.core.bonuses.commands.AnimationCommand;
import mineplex.core.bonuses.commands.GuiCommand;
import mineplex.core.bonuses.commands.TicketCommand;
import mineplex.core.bonuses.event.CarlSpinnerEvent;
import mineplex.core.bonuses.gui.BonusGui;
import mineplex.database.tables.records.BonusRecord;
import mineplex.hub.bonuses.gui.SpinGui;
import mineplex.hub.poll.PollManager;
import mineplex.core.bonuses.gui.SpinGui;
import mineplex.core.poll.PollManager;
import mineplex.serverdata.commands.ServerCommandManager;
import org.jooq.DSLContext;
import org.jooq.SQLDialect;
import org.jooq.impl.DSL;
@ -50,12 +49,9 @@ import org.bukkit.Bukkit;
import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerInteractEntityEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.java.JavaPlugin;
@ -114,6 +110,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
private NpcManager _npcManager;
private HologramManager _hologramManager;
private RewardManager _rewardManager;
private StatsManager _statsManager;
public boolean _enabled;
private Npc _carlNpc;
private AnimationCarl _animation;
@ -122,7 +119,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
private StreakRecord _dailyStreak;
private StreakRecord _voteStreak;
public BonusManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, RewardManager rewardManager)
public BonusManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, RewardManager rewardManager, StatsManager statsManager)
{
super("Bonus", plugin);
_repository = new BonusRepository(plugin, this, donationManager);
@ -132,6 +129,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
_hologramManager = hologramManager;
_rewardManager = rewardManager;
_pollManager = pollManager;
_statsManager = statsManager;
// Hope to god this works!
_canVote = true;
@ -648,11 +646,11 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
{
if (data)
{
UtilPlayer.message(player, F.main("Bonus", "Rewarded " + F.elem(gems + " Gems")));
UtilPlayer.message(player, F.main("Carl", "Rewarded " + F.elem(gems + " Gems")));
}
else
{
UtilPlayer.message(player, F.main("Bonus", "Failed to process Gems"));
UtilPlayer.message(player, F.main("Carl", "Failed to process Gems"));
}
}
}, "BonusManager", player.getName(), player.getUniqueId(), gems, true);
@ -667,11 +665,11 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
{
if (data)
{
UtilPlayer.message(player, F.main("Bonus", "Rewarded " + F.elem(gold + " Gold")));
UtilPlayer.message(player, F.main("Carl", "Rewarded " + F.elem(gold + " Gold")));
}
else
{
UtilPlayer.message(player, F.main("Bonus", "Failed to process Gold"));
UtilPlayer.message(player, F.main("Carl", "Failed to process Gold"));
}
}
}, "BonusManager", player.getName(), coreClient.getAccountId(), gold, true);
@ -686,11 +684,11 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
{
if (data)
{
UtilPlayer.message(player, F.main("Bonus", "Rewarded " + F.elem(coins + " Coins")));
UtilPlayer.message(player, F.main("Carl", "Rewarded " + F.elem(coins + " Coins")));
}
else
{
UtilPlayer.message(player, F.main("Bonus", "Failed to process Coins"));
UtilPlayer.message(player, F.main("Carl", "Failed to process Coins"));
}
}
}, "BonusManager", player.getName(), coreClient.getAccountId(), coins, true);
@ -714,7 +712,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
public void run()
{
bonusClient.setTickets(newTickets);
UtilPlayer.message(player, F.main("Bonus", "Rewarded " + F.elem(tickets + " Carl Spin Ticket")));
UtilPlayer.message(player, F.main("Carl", "Rewarded " + F.elem(tickets + " Carl Spin Ticket")));
}
});
}
@ -729,7 +727,8 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
if (experience > 0)
{
// TODO
_statsManager.incrementStat(player, "Global.ExpEarned", experience);
UtilPlayer.message(player, F.main("Carl", "Rewarded " + F.elem(experience + " Experience")));
}
}

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses;
package mineplex.core.bonuses;
import java.sql.CallableStatement;
import java.sql.Connection;

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses;
package mineplex.core.bonuses;
public class StreakRecord
{

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses;
package mineplex.core.bonuses;
import org.bukkit.entity.Player;

View File

@ -1,7 +1,6 @@
package mineplex.hub.bonuses.animations;
package mineplex.core.bonuses.animations;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilMath;
import mineplex.core.reward.Reward;
import mineplex.core.reward.RewardData;
import mineplex.core.treasure.animation.Animation;

View File

@ -1,10 +1,10 @@
package mineplex.hub.bonuses.commands;
package mineplex.core.bonuses.commands;
import org.bukkit.entity.Player;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.hub.bonuses.BonusManager;
import mineplex.core.bonuses.BonusManager;
public class AnimationCommand extends CommandBase<BonusManager>{

View File

@ -1,12 +1,11 @@
package mineplex.hub.bonuses.commands;
package mineplex.core.bonuses.commands;
import org.bukkit.entity.Player;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.reward.RewardManager;
import mineplex.hub.bonuses.BonusManager;
import mineplex.hub.bonuses.gui.BonusGui;
import mineplex.core.bonuses.BonusManager;
import mineplex.core.bonuses.gui.BonusGui;
public class GuiCommand extends CommandBase<BonusManager>{

View File

@ -1,10 +1,10 @@
package mineplex.hub.bonuses.commands;
package mineplex.core.bonuses.commands;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.hub.bonuses.BonusManager;
import mineplex.core.bonuses.BonusManager;
import org.bukkit.entity.Player;

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.event;
package mineplex.core.bonuses.event;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;

View File

@ -1,17 +1,16 @@
package mineplex.hub.bonuses.gui;
package mineplex.core.bonuses.gui;
import mineplex.core.gui.SimpleGui;
import mineplex.core.reward.RewardManager;
import mineplex.hub.bonuses.BonusManager;
import mineplex.hub.bonuses.gui.buttons.CarlSpinButton;
import mineplex.hub.bonuses.gui.buttons.DailyBonusButton;
import mineplex.hub.bonuses.gui.buttons.PollButton;
import mineplex.hub.bonuses.gui.buttons.RankBonusButton;
import mineplex.hub.bonuses.gui.buttons.VoteButton;
import mineplex.core.bonuses.BonusManager;
import mineplex.core.bonuses.gui.buttons.CarlSpinButton;
import mineplex.core.bonuses.gui.buttons.DailyBonusButton;
import mineplex.core.bonuses.gui.buttons.PollButton;
import mineplex.core.bonuses.gui.buttons.RankBonusButton;
import mineplex.core.bonuses.gui.buttons.VoteButton;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.omg.CORBA._PolicyStub;
public class BonusGui extends SimpleGui
{

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.gui;
package mineplex.core.bonuses.gui;
import java.util.ArrayList;
@ -14,14 +14,10 @@ import mineplex.core.reward.RewardManager;
import mineplex.core.reward.RewardRarity;
import mineplex.core.reward.RewardType;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.treasure.animation.LootLegendaryAnimation;
import mineplex.core.treasure.animation.LootMythicalAnimation;
import mineplex.core.treasure.animation.LootRareAnimation;
import mineplex.core.treasure.animation.LootUncommonAnimation;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.bonuses.BonusManager;
import mineplex.hub.bonuses.gui.buttons.RewardButton;
import mineplex.core.bonuses.BonusManager;
import mineplex.core.bonuses.gui.buttons.RewardButton;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.gui.buttons;
package mineplex.core.bonuses.gui.buttons;
import java.util.ArrayList;
@ -13,8 +13,8 @@ import mineplex.core.common.util.C;
import mineplex.core.gui.GuiItem;
import mineplex.core.reward.RewardManager;
import mineplex.core.shop.item.ShopItem;
import mineplex.hub.bonuses.BonusClientData;
import mineplex.hub.bonuses.BonusManager;
import mineplex.core.bonuses.BonusClientData;
import mineplex.core.bonuses.BonusManager;
public class CarlSpinButton implements GuiItem
{

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.gui.buttons;
package mineplex.core.bonuses.gui.buttons;
import java.util.ArrayList;
@ -16,10 +16,10 @@ import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.bonuses.BonusAmount;
import mineplex.hub.bonuses.BonusClientData;
import mineplex.hub.bonuses.BonusManager;
import mineplex.hub.bonuses.StreakRecord;
import mineplex.core.bonuses.BonusAmount;
import mineplex.core.bonuses.BonusClientData;
import mineplex.core.bonuses.BonusManager;
import mineplex.core.bonuses.StreakRecord;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.gui.buttons;
package mineplex.core.bonuses.gui.buttons;
import java.util.ArrayList;
import java.util.HashMap;
@ -13,8 +13,8 @@ import mineplex.core.gui.SimpleGuiItem;
import mineplex.core.gui.botton.BackBotton;
import mineplex.core.gui.pages.TimedMessageWindow;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.hub.poll.Poll;
import mineplex.hub.poll.PollManager;
import mineplex.core.poll.Poll;
import mineplex.core.poll.PollManager;
import org.bukkit.ChatColor;
import org.bukkit.Material;

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.gui.buttons;
package mineplex.core.bonuses.gui.buttons;
import java.util.ArrayList;
@ -16,8 +16,8 @@ import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.bonuses.BonusAmount;
import mineplex.hub.bonuses.BonusManager;
import mineplex.core.bonuses.BonusAmount;
import mineplex.core.bonuses.BonusManager;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;

View File

@ -1,11 +1,10 @@
package mineplex.hub.bonuses.gui.buttons;
package mineplex.core.bonuses.gui.buttons;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import mineplex.core.gui.GuiItem;
import mineplex.core.reward.Reward;
import mineplex.core.reward.RewardData;
public class RewardButton implements GuiItem

View File

@ -1,4 +1,4 @@
package mineplex.hub.bonuses.gui.buttons;
package mineplex.core.bonuses.gui.buttons;
import java.util.ArrayList;
@ -10,25 +10,17 @@ import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilTime.TimeUnit;
import mineplex.core.gui.GuiItem;
import mineplex.core.gui.ItemRefresher;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.shop.item.ShopItem;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.bonuses.BonusAmount;
import mineplex.hub.bonuses.BonusClientData;
import mineplex.hub.bonuses.BonusManager;
import mineplex.hub.bonuses.StreakRecord;
import net.minecraft.server.v1_7_R4.ChatSerializer;
import net.minecraft.server.v1_7_R4.IChatBaseComponent;
import net.minecraft.server.v1_7_R4.PacketPlayOutChat;
import mineplex.core.bonuses.BonusAmount;
import mineplex.core.bonuses.BonusClientData;
import mineplex.core.bonuses.BonusManager;
import mineplex.core.bonuses.StreakRecord;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;

View File

@ -1,4 +1,4 @@
package mineplex.hub.poll;
package mineplex.core.poll;
import mineplex.core.common.Rank;

View File

@ -1,4 +1,4 @@
package mineplex.hub.poll;
package mineplex.core.poll;
import mineplex.core.common.util.NautHashMap;

View File

@ -1,6 +1,4 @@
package mineplex.hub.poll;
import mineplex.core.common.Rank;
package mineplex.core.poll;
/**
* Created by Shaun on 8/16/2014.

View File

@ -1,4 +1,4 @@
package mineplex.hub.poll;
package mineplex.core.poll;
import java.sql.ResultSet;
import java.sql.SQLException;
@ -23,9 +23,7 @@ import mineplex.core.common.util.Callback;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.donation.DonationManager;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.poll.command.PollCommand;
import mineplex.core.poll.command.PollCommand;
public class PollManager extends MiniDbClientPlugin<PlayerPollData>
{

View File

@ -1,4 +1,4 @@
package mineplex.hub.poll;
package mineplex.core.poll;
import java.sql.ResultSet;
import java.sql.SQLException;

View File

@ -1,4 +1,4 @@
package mineplex.hub.poll;
package mineplex.core.poll;
/**
* Created by Shaun on 8/26/2014.

View File

@ -1,4 +1,4 @@
package mineplex.hub.poll.command;
package mineplex.core.poll.command;
import java.text.DecimalFormat;
import java.util.List;
@ -13,10 +13,10 @@ import mineplex.core.common.jsonchat.JsonMessage;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
import mineplex.hub.poll.PlayerPollData;
import mineplex.hub.poll.Poll;
import mineplex.hub.poll.PollManager;
import mineplex.hub.poll.PollStats;
import mineplex.core.poll.PlayerPollData;
import mineplex.core.poll.Poll;
import mineplex.core.poll.PollManager;
import mineplex.core.poll.PollStats;
/**
* Created by Shaun on 8/17/2014.

View File

@ -39,7 +39,6 @@ import mineplex.core.recharge.Recharge;
import mineplex.core.resourcepack.ResUnloadCheck;
import mineplex.core.resourcepack.ResPackManager;
import mineplex.core.serverConfig.ServerConfiguration;
import mineplex.core.spawn.Spawn;
import mineplex.core.stats.StatsManager;
import mineplex.core.status.ServerStatusManager;
import mineplex.core.task.TaskManager;
@ -49,7 +48,7 @@ import mineplex.core.updater.Updater;
import mineplex.core.velocity.VelocityFix;
import mineplex.core.visibility.VisibilityManager;
import mineplex.hub.modules.StackerManager;
import mineplex.hub.poll.PollManager;
import mineplex.core.poll.PollManager;
import mineplex.hub.queue.QueueManager;
import mineplex.hub.server.ServerManager;
import mineplex.minecraft.game.classcombat.Class.ClassManager;

View File

@ -86,7 +86,7 @@ import mineplex.core.task.TaskManager;
import mineplex.core.treasure.TreasureManager;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.hub.bonuses.BonusManager;
import mineplex.core.bonuses.BonusManager;
import mineplex.hub.commands.ForcefieldRadius;
import mineplex.hub.commands.GadgetToggle;
import mineplex.hub.commands.GameModeCommand;
@ -98,7 +98,7 @@ import mineplex.hub.modules.NewsManager;
import mineplex.hub.modules.ParkourManager;
import mineplex.hub.modules.TextManager;
import mineplex.hub.modules.WorldManager;
import mineplex.hub.poll.PollManager;
import mineplex.core.poll.PollManager;
import mineplex.hub.profile.gui.GUIProfile;
import mineplex.hub.tutorial.TutorialManager;
import mineplex.minecraft.game.classcombat.Skill.event.SkillTriggerEvent;
@ -214,7 +214,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
((CraftWorld)Bukkit.getWorlds().get(0)).getHandle().pvpMode = true;
new BonusManager(plugin, clientManager, donationManager, pollManager , npcManager, hologramManager, rewardManager);
new BonusManager(plugin, clientManager, donationManager, pollManager , npcManager, hologramManager, rewardManager, statsManager);
// NotificationManager notificationManager = new NotificationManager(plugin, clientManager, donationManager);