Remove in-game facebook rewards
This commit is contained in:
parent
d29db7da0a
commit
f7650afb88
|
@ -8,16 +8,13 @@ import java.util.ArrayList;
|
||||||
import java.util.Calendar;
|
import java.util.Calendar;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TimeZone;
|
import java.util.TimeZone;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
import net.minecraft.server.v1_8_R3.DataWatcher;
|
|
||||||
import net.minecraft.server.v1_8_R3.EntityCreeper;
|
|
||||||
import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
|
@ -60,7 +57,6 @@ import mineplex.core.common.util.F;
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
import mineplex.core.common.util.UtilPlayer;
|
||||||
import mineplex.core.common.util.UtilServer;
|
import mineplex.core.common.util.UtilServer;
|
||||||
import mineplex.core.donation.DonationManager;
|
import mineplex.core.donation.DonationManager;
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.gadget.GadgetManager;
|
import mineplex.core.gadget.GadgetManager;
|
||||||
import mineplex.core.hologram.Hologram;
|
import mineplex.core.hologram.Hologram;
|
||||||
import mineplex.core.hologram.HologramManager;
|
import mineplex.core.hologram.HologramManager;
|
||||||
|
@ -84,6 +80,9 @@ import mineplex.database.Tables;
|
||||||
import mineplex.database.tables.records.BonusRecord;
|
import mineplex.database.tables.records.BonusRecord;
|
||||||
import mineplex.serverdata.commands.ServerCommandManager;
|
import mineplex.serverdata.commands.ServerCommandManager;
|
||||||
import mineplex.serverdata.database.DBPool;
|
import mineplex.serverdata.database.DBPool;
|
||||||
|
import net.minecraft.server.v1_8_R3.DataWatcher;
|
||||||
|
import net.minecraft.server.v1_8_R3.EntityCreeper;
|
||||||
|
import net.minecraft.server.v1_8_R3.PacketPlayOutEntityMetadata;
|
||||||
|
|
||||||
public class BonusManager extends MiniClientPlugin<BonusClientData> implements ILoginProcessor
|
public class BonusManager extends MiniClientPlugin<BonusClientData> implements ILoginProcessor
|
||||||
{
|
{
|
||||||
|
@ -150,7 +149,6 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
private HologramManager _hologramManager;
|
private HologramManager _hologramManager;
|
||||||
private TreasureRewardManager _rewardManager;
|
private TreasureRewardManager _rewardManager;
|
||||||
private StatsManager _statsManager;
|
private StatsManager _statsManager;
|
||||||
private FacebookManager _facebookManager;
|
|
||||||
private YoutubeManager _youtubeManager;
|
private YoutubeManager _youtubeManager;
|
||||||
private PlayWireManager _playWireManager;
|
private PlayWireManager _playWireManager;
|
||||||
private PowerPlayClubRepository _powerPlayClubRepository;
|
private PowerPlayClubRepository _powerPlayClubRepository;
|
||||||
|
@ -161,7 +159,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
private AnimationCarl _animation;
|
private AnimationCarl _animation;
|
||||||
private int _visualTick;
|
private int _visualTick;
|
||||||
|
|
||||||
private ArrayList<String> _voteList;
|
private List<String> _voteList;
|
||||||
|
|
||||||
private String _creeperName;
|
private String _creeperName;
|
||||||
|
|
||||||
|
@ -203,7 +201,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
generatePermissions();
|
generatePermissions();
|
||||||
}
|
}
|
||||||
|
|
||||||
public BonusManager(JavaPlugin plugin, Location carlLocation, PlayWireManager playWireManager, CoreClientManager clientManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, StatsManager statsManager, InventoryManager inventoryManager, PetManager petManager, FacebookManager facebookManager, YoutubeManager youtubeManager, GadgetManager gadgetManager, ThankManager thankManager, String creeperName)
|
public BonusManager(JavaPlugin plugin, Location carlLocation, PlayWireManager playWireManager, CoreClientManager clientManager, DonationManager donationManager, PollManager pollManager, NpcManager npcManager, HologramManager hologramManager, StatsManager statsManager, InventoryManager inventoryManager, PetManager petManager, YoutubeManager youtubeManager, GadgetManager gadgetManager, ThankManager thankManager, String creeperName)
|
||||||
{
|
{
|
||||||
super("Bonus", plugin);
|
super("Bonus", plugin);
|
||||||
_repository = new BonusRepository(plugin, this, donationManager);
|
_repository = new BonusRepository(plugin, this, donationManager);
|
||||||
|
@ -224,7 +222,6 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
|
|
||||||
_pollManager = pollManager;
|
_pollManager = pollManager;
|
||||||
_statsManager = statsManager;
|
_statsManager = statsManager;
|
||||||
_facebookManager = facebookManager;
|
|
||||||
_youtubeManager = youtubeManager;
|
_youtubeManager = youtubeManager;
|
||||||
|
|
||||||
_playWireManager = playWireManager;
|
_playWireManager = playWireManager;
|
||||||
|
@ -972,7 +969,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
if (entity.equals(_carlNpc.getEntity()))
|
if (entity.equals(_carlNpc.getEntity()))
|
||||||
{
|
{
|
||||||
updateDailyStreak(player);
|
updateDailyStreak(player);
|
||||||
new BonusGui(_plugin, player, this, _rewardManager, _facebookManager, _youtubeManager, _thankManager, _playWireManager).openInventory();
|
new BonusGui(_plugin, player, this, _rewardManager, _youtubeManager, _thankManager, _playWireManager).openInventory();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1013,7 +1010,6 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
if (canRank(player) && _clientManager.Get(player).hasPermission(Perm.MONTHLY_BONUS) && isPastAugust()) availableRewards++;
|
if (canRank(player) && _clientManager.Get(player).hasPermission(Perm.MONTHLY_BONUS) && isPastAugust()) availableRewards++;
|
||||||
if (canDaily(player)) availableRewards++;
|
if (canDaily(player)) availableRewards++;
|
||||||
if (getPollManager().getNextPoll(_pollManager.Get(player), _clientManager.Get(player).getPrimaryGroup()) != null) availableRewards++;
|
if (getPollManager().getNextPoll(_pollManager.Get(player), _clientManager.Get(player).getPrimaryGroup()) != null) availableRewards++;
|
||||||
if (!_facebookManager.hasRedeemed(player)) availableRewards++;
|
|
||||||
if (_thankManager.Get(player).getThankToClaim() > 0) availableRewards++;
|
if (_thankManager.Get(player).getThankToClaim() > 0) availableRewards++;
|
||||||
if (PowerPlayClubButton.isAvailable(player, _powerPlayClubRepository)) availableRewards++;
|
if (PowerPlayClubButton.isAvailable(player, _powerPlayClubRepository)) availableRewards++;
|
||||||
|
|
||||||
|
@ -1131,11 +1127,6 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
|
||||||
return _pollManager;
|
return _pollManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public FacebookManager getFacebookManager()
|
|
||||||
{
|
|
||||||
return _facebookManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
public YoutubeManager getYoutubeManager()
|
public YoutubeManager getYoutubeManager()
|
||||||
{
|
{
|
||||||
return _youtubeManager;
|
return _youtubeManager;
|
||||||
|
|
|
@ -18,6 +18,6 @@ public class GuiCommand extends CommandBase<BonusManager>
|
||||||
@Override
|
@Override
|
||||||
public void Execute(Player caller, String[] args)
|
public void Execute(Player caller, String[] args)
|
||||||
{
|
{
|
||||||
new BonusGui(Plugin.getPlugin(), caller, Plugin, Managers.require(TreasureRewardManager.class), Plugin.getFacebookManager(), Plugin.getYoutubeManager(), Plugin.getThankManager(), Plugin.getPlayWireManager()).openInventory();
|
new BonusGui(Plugin.getPlugin(), caller, Plugin, Managers.require(TreasureRewardManager.class), Plugin.getYoutubeManager(), Plugin.getThankManager(), Plugin.getPlayWireManager()).openInventory();
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -15,11 +15,10 @@ import mineplex.core.bonuses.gui.buttons.RankBonusButton;
|
||||||
import mineplex.core.bonuses.gui.buttons.TwitterButton;
|
import mineplex.core.bonuses.gui.buttons.TwitterButton;
|
||||||
import mineplex.core.bonuses.gui.buttons.VoteButton;
|
import mineplex.core.bonuses.gui.buttons.VoteButton;
|
||||||
import mineplex.core.bonuses.gui.buttons.YoutubeButton;
|
import mineplex.core.bonuses.gui.buttons.YoutubeButton;
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.gui.SimpleGui;
|
import mineplex.core.gui.SimpleGui;
|
||||||
import mineplex.core.treasure.reward.TreasureRewardManager;
|
|
||||||
import mineplex.core.playwire.PlayWireManager;
|
import mineplex.core.playwire.PlayWireManager;
|
||||||
import mineplex.core.thank.ThankManager;
|
import mineplex.core.thank.ThankManager;
|
||||||
|
import mineplex.core.treasure.reward.TreasureRewardManager;
|
||||||
import mineplex.core.youtube.YoutubeManager;
|
import mineplex.core.youtube.YoutubeManager;
|
||||||
|
|
||||||
public class BonusGui extends SimpleGui
|
public class BonusGui extends SimpleGui
|
||||||
|
@ -38,7 +37,7 @@ public class BonusGui extends SimpleGui
|
||||||
|
|
||||||
private static final int INV_SIZE = 54;
|
private static final int INV_SIZE = 54;
|
||||||
|
|
||||||
public BonusGui(Plugin plugin, Player player, BonusManager manager, TreasureRewardManager rewardManager, FacebookManager facebookManager, YoutubeManager youtubeManager, ThankManager thankManager, PlayWireManager playWireManager)
|
public BonusGui(Plugin plugin, Player player, BonusManager manager, TreasureRewardManager rewardManager, YoutubeManager youtubeManager, ThankManager thankManager, PlayWireManager playWireManager)
|
||||||
{
|
{
|
||||||
super(plugin, player, player.getName() + "'s Bonuses", INV_SIZE);
|
super(plugin, player, player.getName() + "'s Bonuses", INV_SIZE);
|
||||||
|
|
||||||
|
@ -50,7 +49,7 @@ public class BonusGui extends SimpleGui
|
||||||
|
|
||||||
setItem(POLL_SLOT, new PollButton(getPlugin(), player, manager.getPollManager(), manager.getClientManager(), this, manager));
|
setItem(POLL_SLOT, new PollButton(getPlugin(), player, manager.getPollManager(), manager.getClientManager(), this, manager));
|
||||||
|
|
||||||
setItem(FACEBOOK_SLOT, new FacebookButton(player, facebookManager));
|
setItem(FACEBOOK_SLOT, new FacebookButton(player));
|
||||||
|
|
||||||
setItem(YOUTUBE_SLOT, new YoutubeButton(player, youtubeManager));
|
setItem(YOUTUBE_SLOT, new YoutubeButton(player, youtubeManager));
|
||||||
|
|
||||||
|
|
|
@ -1,45 +1,42 @@
|
||||||
package mineplex.core.bonuses.gui.buttons;
|
package mineplex.core.bonuses.gui.buttons;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import mineplex.core.common.jsonchat.ClickEvent;
|
||||||
|
import mineplex.core.common.jsonchat.JsonMessage;
|
||||||
import org.bukkit.ChatColor;
|
import mineplex.core.common.util.C;
|
||||||
|
import mineplex.core.common.util.UtilPlayer;
|
||||||
|
import mineplex.core.gui.GuiItem;
|
||||||
|
import mineplex.core.itemstack.ItemBuilder;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.inventory.ClickType;
|
import org.bukkit.event.inventory.ClickType;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import mineplex.core.bonuses.BonusAmount;
|
|
||||||
import mineplex.core.common.jsonchat.ClickEvent;
|
|
||||||
import mineplex.core.common.jsonchat.JsonMessage;
|
|
||||||
import mineplex.core.common.util.C;
|
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.gui.GuiItem;
|
|
||||||
import mineplex.core.itemstack.ItemStackFactory;
|
|
||||||
|
|
||||||
public class FacebookButton implements GuiItem
|
public class FacebookButton implements GuiItem
|
||||||
{
|
{
|
||||||
private Player _player;
|
private static final ItemStack ICON = new ItemBuilder(Material.LAPIS_BLOCK)
|
||||||
private FacebookManager _facebookManager;
|
.setTitle(C.cGreen + C.Bold + "Visit us on Facebook")
|
||||||
|
.addLore(
|
||||||
|
C.cWhite + "Be sure to \"Like\" us on",
|
||||||
|
C.cWhite + "Facebook for Giveaways, Announcements,",
|
||||||
|
C.cWhite + "and Much More!",
|
||||||
|
" ",
|
||||||
|
C.cGreen + "Click to visit us on Facebook!"
|
||||||
|
)
|
||||||
|
.build();
|
||||||
|
|
||||||
public FacebookButton(Player player, FacebookManager facebookManager)
|
private final Player _player;
|
||||||
|
|
||||||
|
public FacebookButton(Player player)
|
||||||
{
|
{
|
||||||
_player = player;
|
_player = player;
|
||||||
_facebookManager = facebookManager;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setup()
|
public void setup() {}
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void close()
|
public void close() {}
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void click(ClickType clickType)
|
public void click(ClickType clickType)
|
||||||
|
@ -48,55 +45,18 @@ public class FacebookButton implements GuiItem
|
||||||
|
|
||||||
_player.playSound(_player.getLocation(), Sound.NOTE_PLING, 1, 1.6f);
|
_player.playSound(_player.getLocation(), Sound.NOTE_PLING, 1, 1.6f);
|
||||||
|
|
||||||
final String message;
|
|
||||||
if (isAvailable())
|
|
||||||
{
|
|
||||||
message = "claim Facebook Prize!";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
message = "visit our Facebook page!";
|
|
||||||
}
|
|
||||||
|
|
||||||
UtilPlayer.message(_player, C.cGold + C.Bold + C.Strike + "=============================================");
|
UtilPlayer.message(_player, C.cGold + C.Bold + C.Strike + "=============================================");
|
||||||
UtilPlayer.message(_player, "");
|
UtilPlayer.message(_player, "");
|
||||||
|
|
||||||
new JsonMessage(" " + C.Bold + "Click to Open in Web Browser and " + message).click(ClickEvent.OPEN_URL, "https://www.facebook.com/MineplexGames/app/185301094822359/").sendToPlayer(_player);
|
new JsonMessage(" " + C.Bold + "Click to Open in Web Browser").click(ClickEvent.OPEN_URL, "https://www.facebook.com/MineplexGames").sendToPlayer(_player);
|
||||||
new JsonMessage(" " + C.cGreen + C.Line + "https://www.facebook.com/MineplexGames").click(ClickEvent.OPEN_URL, "https://www.facebook.com/MineplexGames/app/185301094822359/").sendToPlayer(_player);
|
new JsonMessage(" " + C.cGreen + C.Line + "https://www.facebook.com/MineplexGames").click(ClickEvent.OPEN_URL, "https://www.facebook.com/MineplexGames").sendToPlayer(_player);
|
||||||
UtilPlayer.message(_player, "");
|
UtilPlayer.message(_player, "");
|
||||||
if (isAvailable())
|
|
||||||
{
|
|
||||||
UtilPlayer.message(_player, " Please be patient. Prizes may take a few minutes to register.");
|
|
||||||
UtilPlayer.message(_player, "");
|
|
||||||
}
|
|
||||||
UtilPlayer.message(_player, C.cGold + C.Bold + C.Strike + "=============================================");
|
UtilPlayer.message(_player, C.cGold + C.Bold + C.Strike + "=============================================");
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isAvailable()
|
|
||||||
{
|
|
||||||
return !_facebookManager.hasRedeemed(_player);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getObject()
|
public ItemStack getObject()
|
||||||
{
|
{
|
||||||
ArrayList<String> lore = new ArrayList<String>();
|
return ICON;
|
||||||
|
|
||||||
if (isAvailable())
|
|
||||||
{
|
|
||||||
lore.add(" ");
|
|
||||||
BonusAmount bonus = new BonusAmount();
|
|
||||||
bonus.setAncientChests(10);
|
|
||||||
bonus.addLore(lore);
|
|
||||||
lore.add(" ");
|
|
||||||
lore.add(C.cGreen + "Click to visit us on Facebook!");
|
|
||||||
return ItemStackFactory.Instance.CreateStack(Material.WATER_BUCKET, (byte) 0, 1, C.cGreen + C.Bold + "Visit us on Facebook", lore);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
lore.add(" ");
|
|
||||||
lore.add(C.cWhite + "You have already claimed the Facebook reward!");
|
|
||||||
return ItemStackFactory.Instance.CreateStack(Material.REDSTONE_BLOCK, (byte) 0, 1, ChatColor.RED + C.Bold + "Visit us on Facebook", lore);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,26 +0,0 @@
|
||||||
package mineplex.core.facebook;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Created by phict on 1/28/2016.
|
|
||||||
*/
|
|
||||||
public class FacebookClient
|
|
||||||
{
|
|
||||||
// Has the player already redeemed a facebook code
|
|
||||||
// This is used so we have instant access for Carl the Creeper
|
|
||||||
private boolean _redeemed;
|
|
||||||
|
|
||||||
public FacebookClient(boolean redeemed)
|
|
||||||
{
|
|
||||||
_redeemed = redeemed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasRedeemed()
|
|
||||||
{
|
|
||||||
return _redeemed;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRedeemed(boolean redeemed)
|
|
||||||
{
|
|
||||||
_redeemed = redeemed;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
package mineplex.core.facebook;
|
|
||||||
|
|
||||||
public class FacebookCode
|
|
||||||
{
|
|
||||||
private final String _code;
|
|
||||||
private final boolean _activated;
|
|
||||||
|
|
||||||
public FacebookCode(String code, boolean activated)
|
|
||||||
{
|
|
||||||
_code = code;
|
|
||||||
_activated = activated;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCode()
|
|
||||||
{
|
|
||||||
return _code;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isActivated()
|
|
||||||
{
|
|
||||||
return _activated;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,130 +0,0 @@
|
||||||
package mineplex.core.facebook;
|
|
||||||
|
|
||||||
import java.sql.ResultSet;
|
|
||||||
import java.sql.SQLException;
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
import org.apache.commons.lang.StringUtils;
|
|
||||||
import org.bukkit.Sound;
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
|
||||||
|
|
||||||
import mineplex.core.MiniDbClientPlugin;
|
|
||||||
import mineplex.core.account.CoreClientManager;
|
|
||||||
import mineplex.core.account.permissions.Permission;
|
|
||||||
import mineplex.core.account.permissions.PermissionGroup;
|
|
||||||
import mineplex.core.common.util.F;
|
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
|
||||||
import mineplex.core.donation.DonationManager;
|
|
||||||
import mineplex.core.facebook.command.FacebookCommand;
|
|
||||||
import mineplex.core.inventory.InventoryManager;
|
|
||||||
|
|
||||||
public class FacebookManager extends MiniDbClientPlugin<FacebookClient>
|
|
||||||
{
|
|
||||||
public enum Perm implements Permission
|
|
||||||
{
|
|
||||||
FACEBOOK_COMMAND,
|
|
||||||
}
|
|
||||||
|
|
||||||
private CoreClientManager _clientManager;
|
|
||||||
private DonationManager _donationManager;
|
|
||||||
private InventoryManager _inventoryManager;
|
|
||||||
|
|
||||||
private FacebookRepository _repository;
|
|
||||||
|
|
||||||
public FacebookManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager, InventoryManager inventoryManager)
|
|
||||||
{
|
|
||||||
super("Facebook", plugin, clientManager);
|
|
||||||
|
|
||||||
_clientManager = clientManager;
|
|
||||||
_donationManager = donationManager;
|
|
||||||
_inventoryManager = inventoryManager;
|
|
||||||
|
|
||||||
_repository = new FacebookRepository(plugin);
|
|
||||||
|
|
||||||
generatePermissions();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void generatePermissions()
|
|
||||||
{
|
|
||||||
|
|
||||||
PermissionGroup.PLAYER.setPermission(Perm.FACEBOOK_COMMAND, true, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addCommands()
|
|
||||||
{
|
|
||||||
addCommand(new FacebookCommand(this));
|
|
||||||
}
|
|
||||||
|
|
||||||
public void tryCode(Player player, String code)
|
|
||||||
{
|
|
||||||
if (!StringUtils.isAlphanumeric(code) || code.length() != 8)
|
|
||||||
{
|
|
||||||
message(player, "Invalid Code");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final int accountId = _clientManager.getAccountId(player);
|
|
||||||
|
|
||||||
runAsync(() ->
|
|
||||||
{
|
|
||||||
_repository.getCode(code, data ->
|
|
||||||
{
|
|
||||||
if (data == null)
|
|
||||||
{
|
|
||||||
message(player, "Invalid Code");
|
|
||||||
}
|
|
||||||
else if (data.isActivated())
|
|
||||||
{
|
|
||||||
message(player, "Code has already been redeemed");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
boolean completed = _repository.activateCode(code, accountId);
|
|
||||||
if (completed)
|
|
||||||
{
|
|
||||||
//_inventoryManager.addItemToInventory(player, TreasureType.ANCIENT.getItemName(), 10);
|
|
||||||
message(player, "Thanks! You earned " + F.elem("10 Ancient Chests"));
|
|
||||||
player.playSound(player.getLocation(), Sound.NOTE_PIANO, 1f, 1f);
|
|
||||||
//_donationManager.RewardCoinsLater(getName(), player, 20000);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
message(player, "You have already redeemed a code!");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean hasRedeemed(Player player)
|
|
||||||
{
|
|
||||||
return Get(player).hasRedeemed();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void message(Player player, String message)
|
|
||||||
{
|
|
||||||
UtilPlayer.message(player, F.main("Facebook", message));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected FacebookClient addPlayer(UUID uuid)
|
|
||||||
{
|
|
||||||
return new FacebookClient(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void processLoginResultSet(String playerName, UUID uuid, int accountId, ResultSet resultSet) throws SQLException
|
|
||||||
{
|
|
||||||
boolean hasRow = resultSet.next();
|
|
||||||
Set(uuid, new FacebookClient(hasRow));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getQuery(int accountId, String uuid, String name)
|
|
||||||
{
|
|
||||||
return "SELECT * FROM facebook WHERE accountId = " + accountId + ";";
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,51 +0,0 @@
|
||||||
package mineplex.core.facebook;
|
|
||||||
|
|
||||||
import java.sql.ResultSet;
|
|
||||||
import java.sql.SQLException;
|
|
||||||
|
|
||||||
import mineplex.core.database.MinecraftRepository;
|
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
|
||||||
|
|
||||||
import mineplex.core.common.util.Callback;
|
|
||||||
import mineplex.serverdata.database.DBPool;
|
|
||||||
import mineplex.serverdata.database.RepositoryBase;
|
|
||||||
import mineplex.serverdata.database.ResultSetCallable;
|
|
||||||
import mineplex.serverdata.database.column.ColumnInt;
|
|
||||||
import mineplex.serverdata.database.column.ColumnVarChar;
|
|
||||||
|
|
||||||
public class FacebookRepository extends RepositoryBase
|
|
||||||
{
|
|
||||||
private static final String GET_CODE = "SELECT code, activated FROM facebook WHERE code = ?";
|
|
||||||
private static final String ACTIVATE_CODE = "UPDATE facebook SET activated = 1, accountId = ?, activationTime = NOW() WHERE code = ?";
|
|
||||||
|
|
||||||
public FacebookRepository(JavaPlugin plugin)
|
|
||||||
{
|
|
||||||
super(DBPool.getAccount());
|
|
||||||
}
|
|
||||||
|
|
||||||
public void getCode(String codeName, Callback<FacebookCode> callback)
|
|
||||||
{
|
|
||||||
executeQuery(GET_CODE, new ResultSetCallable()
|
|
||||||
{
|
|
||||||
@Override
|
|
||||||
public void processResultSet(ResultSet resultSet) throws SQLException
|
|
||||||
{
|
|
||||||
FacebookCode facebookCode = null;
|
|
||||||
|
|
||||||
while (resultSet.next())
|
|
||||||
{
|
|
||||||
String code = resultSet.getString(1);
|
|
||||||
boolean activated = resultSet.getBoolean(2);
|
|
||||||
facebookCode = new FacebookCode(code, activated);
|
|
||||||
}
|
|
||||||
|
|
||||||
callback.run(facebookCode);
|
|
||||||
}
|
|
||||||
}, new ColumnVarChar("code", 8, codeName));
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean activateCode(String codeName, int accountId)
|
|
||||||
{
|
|
||||||
return executeUpdate(ACTIVATE_CODE, new ColumnInt("accountId", accountId), new ColumnVarChar("code", 8, codeName)) == 1;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
package mineplex.core.facebook.command;
|
|
||||||
|
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
import mineplex.core.command.CommandBase;
|
|
||||||
import mineplex.core.common.util.F;
|
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.recharge.Recharge;
|
|
||||||
|
|
||||||
public class FacebookCommand extends CommandBase<FacebookManager>
|
|
||||||
{
|
|
||||||
public FacebookCommand(FacebookManager plugin)
|
|
||||||
{
|
|
||||||
super(plugin, FacebookManager.Perm.FACEBOOK_COMMAND, "facebook", "redeem");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void Execute(Player caller, String[] args)
|
|
||||||
{
|
|
||||||
if (args == null || args.length != 1)
|
|
||||||
{
|
|
||||||
UtilPlayer.message(caller, F.main("Facebook", "Usage: /facebook <code>"));
|
|
||||||
UtilPlayer.message(caller, F.main("Facebook", "Get a redemption code at " + F.elem("facebook.com/MineplexGames")));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!Recharge.Instance.use(caller, "Facebook Command", 10000, true, false, false))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Plugin.tryCode(caller, args[0]);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -73,7 +73,6 @@ import mineplex.core.disguise.disguises.DisguiseBase;
|
||||||
import mineplex.core.disguise.disguises.DisguiseWither;
|
import mineplex.core.disguise.disguises.DisguiseWither;
|
||||||
import mineplex.core.donation.DonationManager;
|
import mineplex.core.donation.DonationManager;
|
||||||
import mineplex.core.donation.Donor;
|
import mineplex.core.donation.Donor;
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.gadget.GadgetManager;
|
import mineplex.core.gadget.GadgetManager;
|
||||||
import mineplex.core.gadget.event.GadgetCollideEntityEvent;
|
import mineplex.core.gadget.event.GadgetCollideEntityEvent;
|
||||||
import mineplex.core.gadget.gadgets.morph.MorphWither;
|
import mineplex.core.gadget.gadgets.morph.MorphWither;
|
||||||
|
@ -198,10 +197,9 @@ public class HubManager extends MiniPlugin implements IChatMessageFormatter
|
||||||
|
|
||||||
_gadgetManager = require(GadgetManager.class);
|
_gadgetManager = require(GadgetManager.class);
|
||||||
|
|
||||||
FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager);
|
|
||||||
YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager);
|
YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager);
|
||||||
PlayWireManager playWireManager = new PlayWireManager(plugin, clientManager);
|
PlayWireManager playWireManager = new PlayWireManager(plugin, clientManager);
|
||||||
_bonusManager = new BonusManager(plugin, null, playWireManager, clientManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, thankManager, "Carter");
|
_bonusManager = new BonusManager(plugin, null, playWireManager, clientManager, donationManager, pollManager , npcManager, hologramManager, statsManager, _inventoryManager, petManager, youtubeManager, _gadgetManager, thankManager, "Carter");
|
||||||
|
|
||||||
World world = _spawn.getWorld();
|
World world = _spawn.getWorld();
|
||||||
_treasureManager = require(TreasureManager.class);
|
_treasureManager = require(TreasureManager.class);
|
||||||
|
|
|
@ -2,13 +2,6 @@ package mineplex.hub;
|
||||||
|
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import net.md_5.bungee.api.chat.ComponentBuilder;
|
|
||||||
import net.md_5.bungee.api.chat.HoverEvent;
|
|
||||||
import net.md_5.bungee.api.chat.HoverEvent.Action;
|
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
|
||||||
import net.minecraft.server.v1_8_R3.EntityInsentient;
|
|
||||||
import net.minecraft.server.v1_8_R3.EntityPlayer;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
@ -50,7 +43,6 @@ import mineplex.core.cosmetic.CosmeticManager;
|
||||||
import mineplex.core.disguise.DisguiseManager;
|
import mineplex.core.disguise.DisguiseManager;
|
||||||
import mineplex.core.disguise.playerdisguise.PlayerDisguiseManager;
|
import mineplex.core.disguise.playerdisguise.PlayerDisguiseManager;
|
||||||
import mineplex.core.donation.DonationManager;
|
import mineplex.core.donation.DonationManager;
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.gadget.GadgetManager;
|
import mineplex.core.gadget.GadgetManager;
|
||||||
import mineplex.core.hologram.HologramManager;
|
import mineplex.core.hologram.HologramManager;
|
||||||
import mineplex.core.incognito.events.IncognitoHidePlayerEvent;
|
import mineplex.core.incognito.events.IncognitoHidePlayerEvent;
|
||||||
|
@ -71,7 +63,6 @@ import mineplex.core.portal.Intent;
|
||||||
import mineplex.core.portal.Portal;
|
import mineplex.core.portal.Portal;
|
||||||
import mineplex.core.preferences.Preference;
|
import mineplex.core.preferences.Preference;
|
||||||
import mineplex.core.preferences.PreferencesManager;
|
import mineplex.core.preferences.PreferencesManager;
|
||||||
import mineplex.core.profile.ProfileManager;
|
|
||||||
import mineplex.core.punish.Punish;
|
import mineplex.core.punish.Punish;
|
||||||
import mineplex.core.quests.QuestManager;
|
import mineplex.core.quests.QuestManager;
|
||||||
import mineplex.core.scoreboard.ScoreboardManager;
|
import mineplex.core.scoreboard.ScoreboardManager;
|
||||||
|
@ -86,7 +77,6 @@ import mineplex.core.youtube.YoutubeManager;
|
||||||
import mineplex.hub.commands.GadgetToggle;
|
import mineplex.hub.commands.GadgetToggle;
|
||||||
import mineplex.hub.doublejump.JumpManager;
|
import mineplex.hub.doublejump.JumpManager;
|
||||||
import mineplex.hub.gimmicks.AdminPunch;
|
import mineplex.hub.gimmicks.AdminPunch;
|
||||||
import mineplex.hub.gimmicks.StaffBuild;
|
|
||||||
import mineplex.hub.hubgame.HubGameManager;
|
import mineplex.hub.hubgame.HubGameManager;
|
||||||
import mineplex.hub.modules.ForcefieldManager;
|
import mineplex.hub.modules.ForcefieldManager;
|
||||||
import mineplex.hub.modules.HubVisibilityManager;
|
import mineplex.hub.modules.HubVisibilityManager;
|
||||||
|
@ -100,11 +90,16 @@ import mineplex.hub.player.HubPlayerManager;
|
||||||
import mineplex.hub.plugin.HalloweenHubPlugin;
|
import mineplex.hub.plugin.HalloweenHubPlugin;
|
||||||
import mineplex.hub.plugin.HubPlugin;
|
import mineplex.hub.plugin.HubPlugin;
|
||||||
import mineplex.hub.scoreboard.HubScoreboard;
|
import mineplex.hub.scoreboard.HubScoreboard;
|
||||||
import mineplex.hub.world.HubPortalManager;
|
|
||||||
import mineplex.hub.world.HubWorldManager;
|
import mineplex.hub.world.HubWorldManager;
|
||||||
import mineplex.hub.world.WorldDataModule;
|
import mineplex.hub.world.WorldDataModule;
|
||||||
import mineplex.minecraft.game.core.combat.DeathMessageType;
|
import mineplex.minecraft.game.core.combat.DeathMessageType;
|
||||||
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
|
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
|
||||||
|
import net.md_5.bungee.api.chat.ComponentBuilder;
|
||||||
|
import net.md_5.bungee.api.chat.HoverEvent;
|
||||||
|
import net.md_5.bungee.api.chat.HoverEvent.Action;
|
||||||
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
|
import net.minecraft.server.v1_8_R3.EntityInsentient;
|
||||||
|
import net.minecraft.server.v1_8_R3.EntityPlayer;
|
||||||
|
|
||||||
public class HubManager extends MiniClientPlugin<HubClient> implements IChatMessageFormatter
|
public class HubManager extends MiniClientPlugin<HubClient> implements IChatMessageFormatter
|
||||||
{
|
{
|
||||||
|
@ -165,11 +160,10 @@ public class HubManager extends MiniClientPlugin<HubClient> implements IChatMess
|
||||||
new BenefitManager(_plugin, clientManager, inventoryManager);
|
new BenefitManager(_plugin, clientManager, inventoryManager);
|
||||||
_gadgetManager = require(GadgetManager.class);
|
_gadgetManager = require(GadgetManager.class);
|
||||||
|
|
||||||
FacebookManager facebookManager = new FacebookManager(_plugin, clientManager, donationManager, inventoryManager);
|
|
||||||
YoutubeManager youtubeManager = new YoutubeManager(_plugin, clientManager, donationManager);
|
YoutubeManager youtubeManager = new YoutubeManager(_plugin, clientManager, donationManager);
|
||||||
PlayWireManager playWireManager = new PlayWireManager(_plugin, clientManager);
|
PlayWireManager playWireManager = new PlayWireManager(_plugin, clientManager);
|
||||||
|
|
||||||
new BonusManager(_plugin, null, playWireManager, clientManager, donationManager, pollManager, npcManager, hologramManager, statsManager, inventoryManager, petManager, facebookManager, youtubeManager, _gadgetManager, thankManager, "Carl");
|
new BonusManager(_plugin, null, playWireManager, clientManager, donationManager, pollManager, npcManager, hologramManager, statsManager, inventoryManager, petManager, youtubeManager, _gadgetManager, thankManager, "Carl");
|
||||||
|
|
||||||
TreasureManager treasureManager = require(TreasureManager.class);
|
TreasureManager treasureManager = require(TreasureManager.class);
|
||||||
new CosmeticManager(_plugin, clientManager, donationManager, inventoryManager, _gadgetManager, petManager, treasureManager, boosterManager, punish);
|
new CosmeticManager(_plugin, clientManager, donationManager, inventoryManager, _gadgetManager, petManager, treasureManager, boosterManager, punish);
|
||||||
|
|
|
@ -7,8 +7,6 @@ import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import net.minecraft.server.v1_8_R3.EntityLiving;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
|
@ -74,7 +72,6 @@ import mineplex.core.events.AddConditionEvent;
|
||||||
import mineplex.core.events.EnableArcadeSpawnEvent;
|
import mineplex.core.events.EnableArcadeSpawnEvent;
|
||||||
import mineplex.core.explosion.Explosion;
|
import mineplex.core.explosion.Explosion;
|
||||||
import mineplex.core.explosion.ExplosionEvent;
|
import mineplex.core.explosion.ExplosionEvent;
|
||||||
import mineplex.core.facebook.FacebookManager;
|
|
||||||
import mineplex.core.gadget.event.GadgetEnableEvent;
|
import mineplex.core.gadget.event.GadgetEnableEvent;
|
||||||
import mineplex.core.gadget.event.ToggleMobsEvent;
|
import mineplex.core.gadget.event.ToggleMobsEvent;
|
||||||
import mineplex.core.gadget.types.Gadget;
|
import mineplex.core.gadget.types.Gadget;
|
||||||
|
@ -113,7 +110,6 @@ import mineplex.core.teleport.Teleport;
|
||||||
import mineplex.core.thank.ThankManager;
|
import mineplex.core.thank.ThankManager;
|
||||||
import mineplex.core.titles.Titles;
|
import mineplex.core.titles.Titles;
|
||||||
import mineplex.core.titles.tracks.TrackManager;
|
import mineplex.core.titles.tracks.TrackManager;
|
||||||
import mineplex.core.valentines.ValentinesGiftManager;
|
|
||||||
import mineplex.core.youtube.YoutubeManager;
|
import mineplex.core.youtube.YoutubeManager;
|
||||||
import mineplex.minecraft.game.classcombat.Class.ClassManager;
|
import mineplex.minecraft.game.classcombat.Class.ClassManager;
|
||||||
import mineplex.minecraft.game.classcombat.Condition.SkillConditionManager;
|
import mineplex.minecraft.game.classcombat.Condition.SkillConditionManager;
|
||||||
|
@ -129,7 +125,6 @@ import mineplex.minecraft.game.core.condition.ConditionManager;
|
||||||
import mineplex.minecraft.game.core.damage.DamageManager;
|
import mineplex.minecraft.game.core.damage.DamageManager;
|
||||||
import mineplex.minecraft.game.core.fire.Fire;
|
import mineplex.minecraft.game.core.fire.Fire;
|
||||||
import mineplex.serverdata.Region;
|
import mineplex.serverdata.Region;
|
||||||
|
|
||||||
import nautilus.game.arcade.addons.SoupAddon;
|
import nautilus.game.arcade.addons.SoupAddon;
|
||||||
import nautilus.game.arcade.booster.GameBoosterManager;
|
import nautilus.game.arcade.booster.GameBoosterManager;
|
||||||
import nautilus.game.arcade.command.CancelNextGameCommand;
|
import nautilus.game.arcade.command.CancelNextGameCommand;
|
||||||
|
@ -170,6 +165,7 @@ import nautilus.game.arcade.managers.lobby.current.NewGameLobbyManager;
|
||||||
import nautilus.game.arcade.managers.lobby.legacy.LegacyGameLobbyManager;
|
import nautilus.game.arcade.managers.lobby.legacy.LegacyGameLobbyManager;
|
||||||
import nautilus.game.arcade.player.ArcadePlayer;
|
import nautilus.game.arcade.player.ArcadePlayer;
|
||||||
import nautilus.game.arcade.shop.ArcadeShop;
|
import nautilus.game.arcade.shop.ArcadeShop;
|
||||||
|
import net.minecraft.server.v1_8_R3.EntityLiving;
|
||||||
|
|
||||||
public class ArcadeManager extends MiniPlugin implements IRelation
|
public class ArcadeManager extends MiniPlugin implements IRelation
|
||||||
{
|
{
|
||||||
|
@ -350,10 +346,9 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
||||||
new GameAchievementManager(this);
|
new GameAchievementManager(this);
|
||||||
_gameTournamentManager = new GameTournamentManager(this);
|
_gameTournamentManager = new GameTournamentManager(this);
|
||||||
new GameStatManager(this);
|
new GameStatManager(this);
|
||||||
FacebookManager facebookManager = new FacebookManager(plugin, clientManager, donationManager, inventoryManager);
|
|
||||||
YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager);
|
YoutubeManager youtubeManager = new YoutubeManager(plugin, clientManager, donationManager);
|
||||||
PlayWireManager playWireManager = new PlayWireManager(plugin, clientManager);
|
PlayWireManager playWireManager = new PlayWireManager(plugin, clientManager);
|
||||||
_bonusManager = new BonusManager(plugin, _gameLobbyManager.getCarl(), playWireManager, clientManager, donationManager, pollManager, npcManager, hologramManager, statsManager, _inventoryManager, petManager, facebookManager, youtubeManager, _cosmeticManager.getGadgetManager(), thankManager, "Carl");
|
_bonusManager = new BonusManager(plugin, _gameLobbyManager.getCarl(), playWireManager, clientManager, donationManager, pollManager, npcManager, hologramManager, statsManager, _inventoryManager, petManager, youtubeManager, _cosmeticManager.getGadgetManager(), thankManager, "Carl");
|
||||||
|
|
||||||
new GameLootManager(this, petManager);
|
new GameLootManager(this, petManager);
|
||||||
_spectatorManager = new GameSpectatorManager(this);
|
_spectatorManager = new GameSpectatorManager(this);
|
||||||
|
|
Loading…
Reference in New Issue