JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
William Burns 2015-07-25 13:06:23 +01:00
commit 65ea7b99ab
115 changed files with 3884 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/Mineplex.Bungee.Mineplexer/src/mineplex/bungee/motd/MotdManager.java
View File

@ -41,6 +41,7 @@ public class MotdManager implements Listener, Runnable
List<String> lines = new ArrayList<String>();
lines.add(" §b§l◄§f§lNEW§b§l► §f§l◄§b§lSKYWARS§f§l► §b§l◄§f§lNEW§b§l►");
//lines.add(" §d§lRank Sale §a§l40% Off");
//lines.add(" §f§l◄§c§lMAINTENANCE§f§l►");
updateMainMotd(" §b§l§m §8§l§m[ §r §9§lMineplex§r §f§lGames§r §8§l§m ]§b§l§m §r", lines);
System.out.println("Updated Bungee MOTD");

2
Plugins/Mineplex.Core.Common/src/mineplex/core/common/Rank.java
View File

@ -75,7 +75,7 @@ public enum Rank
{
UtilPlayer.message(player, C.mHead + "Permissions> " +
C.mBody + "This requires Permission Rank [" +
C.mHead + rank +
C.mHead + rank.Name.toUpperCase() +
C.mBody + "].");
}

2
Plugins/Mineplex.Core/src/mineplex/core/MiniDbClientPlugin.java
View File

@ -21,7 +21,7 @@ public abstract class MiniDbClientPlugin<DataType extends Object> extends MiniCl
clientManager.addStoredProcedureLoginProcessor(this);
}
public abstract void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException;
public abstract void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
public CoreClientManager getClientManager()
{

2
Plugins/Mineplex.Core/src/mineplex/core/account/ILoginProcessor.java
View File

@ -7,7 +7,7 @@ public interface ILoginProcessor
{
String getName();
void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException;
void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException;
String getQuery(int accountId, String uuid, String name);
}

2
Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
View File

@ -142,7 +142,7 @@ public class AccountRepository extends RepositoryBase
for (ILoginProcessor loginProcessor : loginProcessors.values())
{
loginProcessor.processLoginResultSet(name, statement.getResultSet());
loginProcessor.processLoginResultSet(name, accountId, statement.getResultSet());
statement.getMoreResults();
}
}

50
Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java
View File

@ -326,7 +326,7 @@ public enum Achievement
SUPER_PAINTBALL_FLAWLESS_VICTORY("Flawless Victory", 1000,
new String[]{"Super Paintball.Wins"},
new String[]{"Win a team with your entire team alive"},
new String[]{"Win a game with your entire team alive"},
new int[]{1},
AchievementCategory.SUPER_PAINTBALL),
@ -630,6 +630,52 @@ public enum Achievement
new String[]{"Kill 2 enemies while blinded from", "a single flashbang"},
new int[]{1},
AchievementCategory.MINE_STRIKE),
//Bomb Lobbers
BOMB_LOBBERS_WINS("Master Bomber", 1200,
new String[]{"Bomb Lobbers.Wins"},
new String[]{"Win 100 games of Bomb Lobbers"},
new int[] {100},
AchievementCategory.BOMB_LOBBERS),
BOMB_LOBBERS_PROFESSIONAL_LOBBER("Professional Lobber", 1000,
new String[]{"Bomb Lobbers.Thrown"},
new String[]{"Throw 2000 TNT"},
new int[]{2000},
AchievementCategory.BOMB_LOBBERS),
// BOMB_LOBBERS_REKT_X3("Rekt x3", 800,
// new String[]{"Bomb Lobbers.3Kill"},
// new String[]{"Kill 3 players with one explosion"},
// new int[]{1},
// AchievementCategory.BOMB_LOBBERS),
BOMB_LOBBERS_ULTIMATE_KILLER("Ultimate Killer", 800,
new String[]{"Bomb Lobbers.Killer"},
new String[]{"Kill 6 players in a single game"},
new int[]{1},
AchievementCategory.BOMB_LOBBERS),
BOMB_LOBBERS_EXPLOSION_PROOF("Jelly Skin", 1000,
new String[]{"Bomb Lobbers.JellySkin"},
new String[]{"Win a game without taking any damage."},
new int[]{1},
AchievementCategory.BOMB_LOBBERS),
BOMB_LOBBERS_BEST_TEAM("The Best Team", 800,
new String[]{"Bomb Lobbers.BestTeam"},
new String[]{"Win a game without losing a teammate"},
new int[]{1},
AchievementCategory.BOMB_LOBBERS),
BOMB_LOBBERS_BLAST_PROOF("Blast Proof", 800,
new String[]{"Bomb Lobbers.BlastProof"},
new String[]{"Win 20 games using Armorer"},
new int[]{20},
AchievementCategory.BOMB_LOBBERS)
// BOMB_LOBBERS_
;
private String _name;
@ -754,7 +800,7 @@ public enum Achievement
return _category;
}
public AchievementData getLevelData(int exp)
public AchievementData getLevelData(long exp)
{
for (int i = 0; i < _levels.length; i++)
{

31
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java
View File

@ -16,7 +16,7 @@ public enum AchievementCategory
{
GLOBAL("Global", null,
new StatDisplay[] { StatDisplay.GEMS_EARNED, null, new StatDisplay("Games Played", "GamesPlayed"), StatDisplay.TIME_IN_GAME },
Material.EMERALD, 0, GameCategory.GLOBAL, null),
Material.EMERALD, 0, GameCategory.GLOBAL, "None"),
BRIDGES("The Bridges", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -32,11 +32,11 @@ public enum AchievementCategory
UHC("Ultra Hardcore", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
Material.GOLDEN_APPLE, 0, GameCategory.SURVIVAL, "None"),
WIZARDS("Wizards", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Witch Doctor Kit"),
CASTLE_SIEGE("Castle Siege", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, new StatDisplay("Kills as Defenders"), new StatDisplay("Deaths as Defenders"),
@ -45,7 +45,7 @@ public enum AchievementCategory
BLOCK_HUNT("Block Hunt", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.GRASS, 0, GameCategory.CLASSICS, null),
Material.GRASS, 0, GameCategory.CLASSICS, "Infestor Kit"),
SMASH_MOBS("Super Smash Mobs", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -53,11 +53,11 @@ public enum AchievementCategory
MINE_STRIKE("MineStrike", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.TNT, 0, GameCategory.CLASSICS, null),
Material.TNT, 0, GameCategory.CLASSICS, "None"),
DRAW_MY_THING("Draw My Thing", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, null),
Material.BOOK_AND_QUILL, 0, GameCategory.CLASSICS, "Extra Tools Kit"),
CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM"},
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -65,7 +65,7 @@ public enum AchievementCategory
MASTER_BUILDERS("Master Builders", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
Material.WOOD, 0, GameCategory.CLASSICS, null),
Material.WOOD, 0, GameCategory.CLASSICS, "None"),
//Arcade
DRAGONS("Dragons", null,
@ -74,7 +74,7 @@ public enum AchievementCategory
DRAGON_ESCAPE("Dragon Escape", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
Material.DRAGON_EGG, 0, GameCategory.ARCADE, null),
Material.DRAGON_EGG, 0, GameCategory.ARCADE, "Digger Kit"),
SHEEP_QUEST("Sheep Quest", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -82,11 +82,11 @@ public enum AchievementCategory
SNEAKY_ASSASSINS("Sneaky Assassins", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.INK_SACK, 0, GameCategory.ARCADE, null),
Material.INK_SACK, 0, GameCategory.ARCADE, "Briber Kit"),
ONE_IN_THE_QUIVER("One in the Quiver", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.BOW, 0, GameCategory.ARCADE, null),
Material.BOW, 0, GameCategory.ARCADE, "Slam Shooter Kit"),
SUPER_PAINTBALL("Super Paintball", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -97,11 +97,11 @@ public enum AchievementCategory
Material.HARD_CLAY, 14, GameCategory.ARCADE, null),
RUNNER("Runner", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.LEATHER_BOOTS, 0, GameCategory.ARCADE, null),
SPLEEF("Super Spleef", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.IRON_SPADE, 0, GameCategory.ARCADE, null),
DEATH_TAG("Death Tag", null,
@ -110,7 +110,7 @@ public enum AchievementCategory
SNAKE("Snake", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.WOOL, 4, GameCategory.ARCADE, null),
Material.WOOL, 4, GameCategory.ARCADE, "Reversal Snake Kit"),
BACON_BRAWL("Bacon Brawl", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -118,8 +118,11 @@ public enum AchievementCategory
MICRO_BATTLE("Micro Battle", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.LAVA, 0, GameCategory.ARCADE, null);
Material.LAVA, 0, GameCategory.ARCADE, null),
BOMB_LOBBERS("Bomb Lobbers", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
Material.FIREBALL, 0, GameCategory.ARCADE, "Waller Kit");
private String _name;
private String[] _statsToPull;

10
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementData.java
View File

@ -3,10 +3,10 @@ package mineplex.core.achievement;
public class AchievementData
{
private int _level;
private int _expRemainder;
private int _expNextLevel;
private long _expRemainder;
private long _expNextLevel;
public AchievementData(int level, int expRemainder, int expNextLevel)
public AchievementData(int level, long expRemainder, long expNextLevel)
{
_level = level;
_expRemainder = expRemainder;
@ -18,12 +18,12 @@ public class AchievementData
return _level;
}
public int getExpRemainder()
public long getExpRemainder()
{
return _expRemainder;
}
public int getExpNextLevel()
public long getExpNextLevel()
{
return _expNextLevel;
}

4
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementLog.java
View File

@ -2,10 +2,10 @@ package mineplex.core.achievement;
public class AchievementLog
{
public int Amount;
public long Amount;
public boolean LevelUp;
public AchievementLog(int amount, boolean levelUp)
public AchievementLog(long amount, boolean levelUp)
{
Amount = amount;
LevelUp = levelUp;

2
Plugins/Mineplex.Core/src/mineplex/core/antihack/AntiHack.java
View File

@ -345,7 +345,7 @@ public class AntiHack extends MiniPlugin
}
//Auto-Kick
if (!handled && _clientManager.Get(player).GetRank() == Rank.YOUTUBE)
if (!handled && _clientManager.Get(player).GetRank() != Rank.YOUTUBE && _clientManager.Get(player).GetRank() != Rank.TWITCH)
{
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 2f, 0.5f);

2
Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManager.java
View File

@ -73,7 +73,7 @@ public class BenefitManager extends MiniDbClientPlugin<BenefitData>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.retrievePlayerBenefitData(resultSet));
}

2
Plugins/Mineplex.Core/src/mineplex/core/chat/Chat.java
View File

@ -329,7 +329,7 @@ public class Chat extends MiniPlugin
UtilPlayer.message(sender, F.main("Chat",
"Accusing players of cheating in-game is against the rules."
+ "If you think someone is cheating, please gather evidence and report it at "
+ F.link("www.mineplex.com/supporthub/")));
+ F.link("www.mineplex.com/reports")));
event.setCancelled(true);
}
else if (_playerLastMessage.containsKey(sender.getUniqueId()))

3
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
View File

@ -52,6 +52,9 @@ public class Menu extends ShopPageBase<CosmeticManager, CosmeticShop>
" ",
ChatColor.RESET + C.cPurple + "Hero Rank",
ChatColor.RESET + "Receives 15000 Coins per Month",
" ",
ChatColor.RESET + C.cGreen + "Legend Rank",
ChatColor.RESET + "Recieves 30000 Coins per Month"
}, 1, false));
addButton(18, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this));

2
Plugins/Mineplex.Core/src/mineplex/core/donation/DonationManager.java
View File

@ -386,7 +386,7 @@ public class DonationManager extends MiniDbClientPlugin<Donor>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Get(playerName).addGold(_repository.retrieveDonorInfo(resultSet).getGold());
}

2
Plugins/Mineplex.Core/src/mineplex/core/elo/EloManager.java
View File

@ -108,7 +108,7 @@ public class EloManager extends MiniDbClientPlugin<EloClientData>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

2
Plugins/Mineplex.Core/src/mineplex/core/friend/FriendManager.java
View File

@ -401,7 +401,7 @@ public class FriendManager extends MiniDbClientPlugin<FriendData>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/BlockForm.java
View File

@ -3,7 +3,6 @@ package mineplex.core.gadget.gadgets;
import java.util.ArrayList;
import java.util.List;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.MapUtil;
import mineplex.core.common.util.UtilBlock;
@ -64,6 +63,7 @@ public class BlockForm
DisguiseChicken disguise = new DisguiseChicken(_player);
disguise.setBaby();
disguise.setSoundDisguise(new DisguiseCat(_player));
disguise.setInvisible(true);
_host.Manager.getDisguiseManager().disguise(disguise);
//Apply Falling Block

1
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/ItemMelonLauncher.java
View File

@ -126,6 +126,7 @@ public class ItemMelonLauncher extends ItemGadget implements IThrown
event.getPlayer().getWorld().playSound(event.getPlayer().getLocation(), Sound.EAT, 1f, 1f);
if (!event.getPlayer().hasPotionEffect(PotionEffectType.SPEED))
event.getPlayer().addPotionEffect(new PotionEffect(PotionEffectType.SPEED, 80, 1), true);
}

3
Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
View File

@ -27,6 +27,7 @@ public enum GameDisplay
HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21),
Lobbers("Bomb Lobbers", Material.FIREBALL, (byte) 0, GameCategory.ARCADE, 53),
Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27),
MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CHAMPIONS, 25),// Temp set to CHAMPIONS to fix UI bug
@ -60,7 +61,7 @@ public enum GameDisplay
Build("Master Builders", Material.WOOD, (byte)0, GameCategory.CLASSICS, 50),
Cards("Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
Skywars("Skywars", Material.FEATHER, (byte)5, GameCategory.SURVIVAL, 52),
Skywars("Skywars", Material.FEATHER, (byte) 0, GameCategory.SURVIVAL, 52),
Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);

2
Plugins/Mineplex.Core/src/mineplex/core/ignore/IgnoreManager.java
View File

@ -230,7 +230,7 @@ public class IgnoreManager extends MiniDbClientPlugin<IgnoreData>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

2
Plugins/Mineplex.Core/src/mineplex/core/inventory/InventoryManager.java
View File

@ -251,7 +251,7 @@ public class InventoryManager extends MiniDbClientPlugin<ClientInventory>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

2
Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java
View File

@ -125,7 +125,7 @@ public class PersonalServerManager extends MiniPlugin
Rank rank = _clientManager.Get(player).GetRank();
if (eventServer || rank.Has(Rank.SNR_MODERATOR) || rank == Rank.YOUTUBE)
if (eventServer || rank.Has(Rank.SNR_MODERATOR) || rank == Rank.YOUTUBE || rank == Rank.TWITCH)
{
ram = 2048;
cpu = 4;

2
Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesManager.java
View File

@ -106,7 +106,7 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

2
Plugins/Mineplex.Core/src/mineplex/core/preferences/ui/PreferencesPage.java
View File

@ -255,7 +255,7 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
buildPreference(40, Material.RED_ROSE, "Show Pending Friend Requests", userPreferences.PendingFriendRequests, _togglePendingFriendRequests);
if (getClientManager().Get(getPlayer()).GetRank() == Rank.YOUTUBE)
if (getClientManager().Get(getPlayer()).GetRank() == Rank.YOUTUBE || getClientManager().Get(getPlayer()).GetRank() == Rank.TWITCH)
{
buildPreference(38, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
buildPreference(42, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);

23
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileManager.java
View File

@ -1,15 +1,13 @@
package mineplex.core.projectile;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map.Entry;
import java.util.WeakHashMap;
import mineplex.core.MiniPlugin;
import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.disguise.DisguiseManager;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import org.bukkit.Effect;
import org.bukkit.Sound;
@ -35,7 +33,7 @@ public class ProjectileManager extends MiniPlugin
{
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false,
null, 1f, 1f, null, 0, null, null, hitboxGrow));
null, 1f, 1f, null, 0, null, null, 0F, 0F, 0F, 0F, 1, hitboxGrow));
}
public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback,
@ -43,7 +41,7 @@ public class ProjectileManager extends MiniPlugin
{
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, pickup,
null, 1f, 1f, null, 0, null, null, hitboxGrow));
null, 1f, 1f, null, 0, null, null, 0F, 0F, 0F, 0F, 1, hitboxGrow));
}
public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback,
@ -52,7 +50,7 @@ public class ProjectileManager extends MiniPlugin
{
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false,
sound, soundVolume, soundPitch, effect, effectData, effectRate, null, hitboxGrow));
sound, soundVolume, soundPitch, effect, effectData, effectRate, null, 0F, 0F, 0F, 0F, 1, hitboxGrow));
}
public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback,
@ -61,7 +59,7 @@ public class ProjectileManager extends MiniPlugin
{
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false,
sound, soundVolume, soundPitch, effect, effectData, effectRate, particle, hitboxGrow));
sound, soundVolume, soundPitch, effect, effectData, effectRate, particle, 0F, 0F, 0F, 0F, 1, hitboxGrow));
}
public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback,
@ -70,7 +68,16 @@ public class ProjectileManager extends MiniPlugin
{
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false,
sound, soundVolume, soundPitch, null, 0, effectRate, particle, hitboxMult));
sound, soundVolume, soundPitch, null, 0, effectRate, particle, 0F, 0F, 0F, 0F, 1, hitboxMult));
}
public void AddThrow(Entity thrown, LivingEntity thrower, IThrown callback,
long expireTime, boolean hitPlayer, boolean hitBlock, boolean idle,
Sound sound, float soundVolume, float soundPitch, ParticleType particle, float pX, float pY, float pZ, float pS, int pC, UpdateType effectRate, float hitboxMult)
{
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false,
sound, soundVolume, soundPitch, null, 0, effectRate, particle, pX, pY, pZ, pS, pC, hitboxMult));
}
@EventHandler

30
Plugins/Mineplex.Core/src/mineplex/core/projectile/ProjectileUser.java
View File

@ -1,16 +1,13 @@
package mineplex.core.projectile;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.core.updater.UpdateType;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.disguise.DisguiseManager;
import mineplex.core.disguise.disguises.DisguiseSquid;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import net.minecraft.server.v1_7_R4.AxisAlignedBB;
import net.minecraft.server.v1_7_R4.MathHelper;
import net.minecraft.server.v1_7_R4.MovingObjectPosition;
@ -25,7 +22,6 @@ import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftLivingEntity;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
@ -46,7 +42,14 @@ public class ProjectileUser
private Sound _sound = null;
private float _soundVolume = 1f;
private float _soundPitch = 1f;
private ParticleType _particle = null;
private float _particleX = 0F;
private float _particleY = 0F;
private float _particleZ = 0F;
private float _particleS = 0F;
private int _particleC = 1;
private Effect _effect = null;
private int _effectData = 0;
private UpdateType _effectRate = UpdateType.TICK;
@ -57,8 +60,8 @@ public class ProjectileUser
long expireTime, boolean hitPlayer, boolean hitBlock, boolean idle, boolean pickup,
Sound sound, float soundVolume, float soundPitch,
Effect effect, int effectData, UpdateType effectRate,
ParticleType particle,
double hitboxMult)
ParticleType particle, float particleX, float particleY,
float particleZ, float particleS, int particleC, double hitboxMult)
{
Throw = throwInput;
@ -76,6 +79,11 @@ public class ProjectileUser
_soundVolume = soundVolume;
_soundPitch = soundPitch;
_particle = particle;
_particleX = particleX;
_particleY = particleY;
_particleZ = particleZ;
_particleS = particleS;
_particleC = particleC;
_effect = effect;
_effectData = effectData;
_effectRate = effectRate;
@ -95,7 +103,7 @@ public class ProjectileUser
_thrown.getWorld().playEffect(_thrown.getLocation(), _effect, _effectData);
if (_particle != null)
UtilParticle.PlayParticle(_particle, _thrown.getLocation(), 0f, 0f, 0f, 0, 1,
UtilParticle.PlayParticle(_particle, _thrown.getLocation(), _particleX, _particleY, _particleZ, _particleS, _particleC,
ViewDist.LONG, UtilServer.getPlayers());
}

10
Plugins/Mineplex.Core/src/mineplex/core/stats/PlayerStats.java
View File

@ -6,13 +6,13 @@ import mineplex.core.common.util.NautHashMap;
public class PlayerStats
{
private NautHashMap<String, Integer> _statHash = new NautHashMap<String, Integer>();
private NautHashMap<String, Long> _statHash = new NautHashMap<String,Long>();
public int addStat(String statName, int value)
public long addStat(String statName, long value)
{
if (!_statHash.containsKey(statName))
{
_statHash.put(statName, 0);
_statHash.put(statName, 0L);
}
_statHash.put(statName, _statHash.get(statName) + value);
@ -20,9 +20,9 @@ public class PlayerStats
return _statHash.get(statName);
}
public int getStat(String statName)
public long getStat(String statName)
{
return _statHash.containsKey(statName) ? _statHash.get(statName) : 0;
return _statHash.containsKey(statName) ? _statHash.get(statName) : 0L;
}
public Set<String> getStatsNames()

99
Plugins/Mineplex.Core/src/mineplex/core/stats/SecondaryStatHandler.java Normal file
View File

@ -0,0 +1,99 @@
package mineplex.core.stats;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.jooq.Configuration;
import org.jooq.DSLContext;
import org.jooq.Delete;
import org.jooq.Insert;
import org.jooq.SQLDialect;
import org.jooq.TransactionalRunnable;
import org.jooq.Update;
import org.jooq.impl.DSL;
import mineplex.core.account.ILoginProcessor;
import mineplex.core.database.DBPool;
import mineplex.database.Tables;
public class SecondaryStatHandler implements ILoginProcessor
{
private StatsManager _statsManager;
private StatsRepository _repository;
public SecondaryStatHandler(StatsManager statsManager, StatsRepository repository)
{
_statsManager = statsManager;
_repository = repository;
}
@Override
public String getName()
{
return "Secondary Stat Handler";
}
@Override
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
PlayerStats oldPlayerStats = _statsManager.Get(playerName);
PlayerStats newPlayerStats = _repository.loadClientInformation(resultSet);
if (newPlayerStats.getStatsNames().size() == 0 && oldPlayerStats.getStatsNames().size() != 0)
{
try
{
DSLContext context = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
final List<Insert> inserts = new ArrayList<>();
final List<Delete> deletes = new ArrayList<>();
for (String statName : oldPlayerStats.getStatsNames())
{
Integer statId = _statsManager.getStatId(statName);
Insert insert = context
.insertInto(Tables.accountStat)
.set(Tables.accountStat.accountId, accountId)
.set(Tables.accountStat.statId, statId)
.set(Tables.accountStat.value, oldPlayerStats.getStat(statName));
inserts.add(insert);
Delete delete = context.delete(Tables.accountStats)
.where(Tables.accountStats.accountId.equal(accountId));
deletes.add(delete);
}
context.transaction(new TransactionalRunnable()
{
@Override
public void run(Configuration config) throws Exception
{
DSL.using(config).batch(inserts).execute();
DSL.using(config).batch(deletes).execute();
}
});
}
catch (Exception e)
{
e.printStackTrace();
}
}
else
{
_statsManager.replacePlayerHack(playerName, newPlayerStats);
}
}
@Override
public String getQuery(int accountId, String uuid, String name)
{
return "SELECT stats.name, value FROM accountStat INNER JOIN stats ON stats.id = accountStat.statId WHERE accountStat.accountId = '" + accountId + "';";
}
}

37
Plugins/Mineplex.Core/src/mineplex/core/stats/StatsManager.java
View File

@ -9,7 +9,6 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniDbClientPlugin;
import mineplex.core.account.CoreClient;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilServer;
@ -24,7 +23,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
private StatsRepository _repository;
private NautHashMap<String, Integer> _stats = new NautHashMap<String, Integer>();
private NautHashMap<Player, NautHashMap<String, Integer>> _statUploadQueue = new NautHashMap<Player, NautHashMap<String, Integer>>();
private NautHashMap<Player, NautHashMap<String, Long>> _statUploadQueue = new NautHashMap<Player, NautHashMap<String, Long>>();
private Runnable _saveRunnable;
public StatsManager(JavaPlugin plugin, CoreClientManager clientManager)
@ -50,11 +49,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
{
_stats.put(stat.Name, stat.Id);
}
clientManager.addStoredProcedureLoginProcessor(new SecondaryStatHandler(this, _repository));
}
public void incrementStat(final Player player, final String statName, final int value)
public void incrementStat(final Player player, final String statName, final long value)
{
int newValue = Get(player).addStat(statName, value);
long newValue = Get(player).addStat(statName, value);
//Event
UtilServer.getServer().getPluginManager().callEvent(new StatChangeEvent(player.getName(), statName, newValue - value, newValue));
@ -97,15 +98,15 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
}
}
private void addToQueue(String statName, Player player, int value)
private void addToQueue(String statName, Player player, long value)
{
synchronized (_statSync)
{
if (!_statUploadQueue.containsKey(player))
_statUploadQueue.put(player, new NautHashMap<String, Integer>());
_statUploadQueue.put(player, new NautHashMap<String, Long>());
if (!_statUploadQueue.get(player).containsKey(statName))
_statUploadQueue.get(player).put(statName, 0);
_statUploadQueue.get(player).put(statName, 0L);
_statUploadQueue.get(player).put(statName, _statUploadQueue.get(player).get(statName) + value);
}
@ -118,7 +119,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
try
{
NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>();
NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
synchronized (_statSync)
{
@ -131,7 +132,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
int uploadKey = ClientManager.getCachedClientAccountId(player.getUniqueId());
uploadQueue.put(uploadKey, new NautHashMap<Integer, Integer>());
uploadQueue.put(uploadKey, new NautHashMap<Integer, Long>());
for (String statName : _statUploadQueue.get(player).keySet())
{
@ -152,13 +153,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
}
}
public boolean incrementStat(final int accountId, final String statName, final int value)
public boolean incrementStat(final int accountId, final String statName, final long value)
{
if (_stats.containsKey(statName))
return false;
final NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>();
uploadQueue.put(accountId, new NautHashMap<Integer, Integer>());
final NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
uploadQueue.put(accountId, new NautHashMap<Integer, Long>());
uploadQueue.get(accountId).put(_stats.get(statName), value);
runAsync(new Runnable()
@ -172,6 +173,16 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
return true;
}
public int getStatId(String statName)
{
return _stats.get(statName);
}
public void replacePlayerHack(String playerName, PlayerStats playerStats)
{
Set(playerName, playerStats);
}
@Override
protected PlayerStats AddPlayer(String player)
{
@ -191,7 +202,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

26
Plugins/Mineplex.Core/src/mineplex/core/stats/StatsRepository.java
View File

@ -77,7 +77,7 @@ public class StatsRepository extends RepositoryBase
}
@SuppressWarnings("rawtypes")
public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue)
public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue)
{
try
{
@ -91,18 +91,18 @@ public class StatsRepository extends RepositoryBase
for (Integer statId : uploadQueue.get(accountId).keySet())
{
Update update = context
.update(Tables.accountStats)
.set(Tables.accountStats.value, Tables.accountStats.value.plus(uploadQueue.get(accountId).get(statId)))
.where(Tables.accountStats.accountId.eq(accountId))
.and(Tables.accountStats.statId.eq(statId));
.update(Tables.accountStat)
.set(Tables.accountStat.value, Tables.accountStat.value.plus(uploadQueue.get(accountId).get(statId)))
.where(Tables.accountStat.accountId.eq(accountId))
.and(Tables.accountStat.statId.eq(statId));
updates.add(update);
Insert insert = context
.insertInto(Tables.accountStats)
.set(Tables.accountStats.accountId, accountId)
.set(Tables.accountStats.statId, statId)
.set(Tables.accountStats.value, uploadQueue.get(accountId).get(statId));
.insertInto(Tables.accountStat)
.set(Tables.accountStat.accountId, accountId)
.set(Tables.accountStat.statId, statId)
.set(Tables.accountStat.value, uploadQueue.get(accountId).get(statId));
inserts.add(insert);
}
@ -137,10 +137,10 @@ public class StatsRepository extends RepositoryBase
context = DSL.using(getConnectionPool(), SQLDialect.MYSQL);
}
Result<Record2<String, Integer>> result = context.select(Tables.stats.name, Tables.accountStats.value).from(Tables.accountStats)
Result<Record2<String, Long>> result = context.select(Tables.stats.name, Tables.accountStat.value).from(Tables.accountStat)
.join(Tables.stats)
.on(Tables.stats.id.eq(Tables.accountStats.statId))
.where(Tables.accountStats.accountId.eq(DSL.select(Tables.accounts.id)
.on(Tables.stats.id.eq(Tables.accountStat.statId))
.where(Tables.accountStat.accountId.eq(DSL.select(Tables.accounts.id)
.from(Tables.accounts)
.where(Tables.accounts.name.eq(playerName)))
).fetch();
@ -149,7 +149,7 @@ public class StatsRepository extends RepositoryBase
if (result.isNotEmpty())
{
playerStats = new PlayerStats();
for (Record2<String, Integer> record : result)
for (Record2<String, Long> record : result)
{
playerStats.addStat(record.value1(), record.value2());
}

2
Plugins/Mineplex.Core/src/mineplex/core/stats/command/GiveStatCommand.java
View File

@ -47,7 +47,7 @@ public class GiveStatCommand extends CommandBase<StatsManager>
final CoreClient client = Plugin.getClientManager().Get(args[0]);
if (client != null)
Plugin.incrementStat(client.getAccountId(), statName, Integer.parseInt(args[args.length - 1]));
Plugin.incrementStat(client.getAccountId(), statName, Long.parseLong(args[args.length - 1]));
else
caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + args[0] + "'s account!"));
}

4
Plugins/Mineplex.Core/src/mineplex/core/stats/command/TimeCommand.java
View File

@ -55,7 +55,7 @@ public class TimeCommand extends CommandBase<StatsManager>
}
else
{
int time = stats.getStat("Global.TimeInGame");
long time = stats.getStat("Global.TimeInGame");
UtilPlayer.message(caller, F.main("Time", F.name(args[0]) + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game"));
}
}
@ -70,7 +70,7 @@ public class TimeCommand extends CommandBase<StatsManager>
}
else
{
int time = Plugin.Get(target).getStat("Global.TimeInGame");
long time = Plugin.Get(target).getStat("Global.TimeInGame");
UtilPlayer.message(caller, F.main("Time", F.name(target.getName() + " has spent " + F.elem(UtilTime.convertString(time * 1000L, 1, UtilTime.TimeUnit.FIT)) + " in game")));
}
}

10
Plugins/Mineplex.Core/src/mineplex/core/stats/event/StatChangeEvent.java
View File

@ -11,10 +11,10 @@ public class StatChangeEvent extends Event
private String _player;
private String _statName;
private int _valueBefore;
private int _valueAfter;
private long _valueBefore;
private long _valueAfter;
public StatChangeEvent(String player, String statName, int valueBefore, int valueAfter)
public StatChangeEvent(String player, String statName, long valueBefore, long valueAfter)
{
_player = player;
_statName = statName;
@ -42,12 +42,12 @@ public class StatChangeEvent extends Event
return _statName;
}
public int getValueBefore()
public long getValueBefore()
{
return _valueBefore;
}
public int getValueAfter()
public long getValueAfter()
{
return _valueAfter;
}

2
Plugins/Mineplex.Core/src/mineplex/core/task/TaskManager.java
View File

@ -134,7 +134,7 @@ public class TaskManager extends MiniDbClientPlugin<TaskClient>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadClientInformation(resultSet));
}

5
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureLocation.java
View File

@ -99,7 +99,10 @@ public class TreasureLocation implements Listener
setHoloChestVisible(false);
if (treasureType == TreasureType.ANCIENT || treasureType == TreasureType.MYTHICAL)
if (treasureType == TreasureType.ANCIENT)
Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening an " + treasureType.getName()));
if (treasureType == TreasureType.MYTHICAL)
Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening a " + treasureType.getName()));
Reward[] rewards = _treasureManager.getRewards(player, treasureType.getRewardType());

5
Plugins/Mineplex.Database/src/mineplex/database/Account.java
View File

@ -16,7 +16,7 @@ package mineplex.database;
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Account extends org.jooq.impl.SchemaImpl implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = -478529995;
private static final long serialVersionUID = 625106486;
/**
* The reference instance of <code>Account</code>
@ -48,6 +48,7 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
mineplex.database.tables.AccountPolls.accountPolls,
mineplex.database.tables.AccountPreferences.accountPreferences,
mineplex.database.tables.Accounts.accounts,
mineplex.database.tables.AccountStat.accountStat,
mineplex.database.tables.AccountStats.accountStats,
mineplex.database.tables.AccountTasks.accountTasks,
mineplex.database.tables.AccountTransactions.accountTransactions,
@ -67,9 +68,11 @@ public class Account extends org.jooq.impl.SchemaImpl implements java.io.Seriali
mineplex.database.tables.ItemCategories.itemCategories,
mineplex.database.tables.Items.items,
mineplex.database.tables.Mail.mail,
mineplex.database.tables.Mailbox.mailbox,
mineplex.database.tables.Npcs.npcs,
mineplex.database.tables.PlayerMap.playerMap,
mineplex.database.tables.Polls.polls,
mineplex.database.tables.RankBenefits.rankBenefits,
mineplex.database.tables.ServerPassword.serverPassword,
mineplex.database.tables.Spawns.spawns,
mineplex.database.tables.StatEvents.statEvents,

18
Plugins/Mineplex.Database/src/mineplex/database/Keys.java
View File

@ -47,9 +47,11 @@ public class Keys {
public static final org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = Identities0.IDENTITY_itemCategories;
public static final org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = Identities0.IDENTITY_items;
public static final org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = Identities0.IDENTITY_mail;
public static final org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = Identities0.IDENTITY_mailbox;
public static final org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = Identities0.IDENTITY_npcs;
public static final org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = Identities0.IDENTITY_playerMap;
public static final org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = Identities0.IDENTITY_polls;
public static final org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = Identities0.IDENTITY_rankBenefits;
public static final org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = Identities0.IDENTITY_serverPassword;
public static final org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = Identities0.IDENTITY_spawns;
public static final org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = Identities0.IDENTITY_statEvents;
@ -75,6 +77,7 @@ public class Keys {
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = UniqueKeys0.KEY_accountPreferences_uuid_index;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = UniqueKeys0.KEY_accounts_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = UniqueKeys0.KEY_accounts_uuidIndex;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = UniqueKeys0.KEY_accountStat_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = UniqueKeys0.KEY_accountStats_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = UniqueKeys0.KEY_accountTasks_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = UniqueKeys0.KEY_accountTransactions_PRIMARY;
@ -101,10 +104,12 @@ public class Keys {
public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = UniqueKeys0.KEY_items_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = UniqueKeys0.KEY_items_uniqueNameCategoryIndex;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = UniqueKeys0.KEY_mail_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = UniqueKeys0.KEY_mailbox_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = UniqueKeys0.KEY_npcs_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = UniqueKeys0.KEY_playerMap_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = UniqueKeys0.KEY_playerMap_playerIndex;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = UniqueKeys0.KEY_polls_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = UniqueKeys0.KEY_rankBenefits_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = UniqueKeys0.KEY_serverPassword_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = UniqueKeys0.KEY_spawns_PRIMARY;
public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = UniqueKeys0.KEY_statEvents_PRIMARY;
@ -131,6 +136,8 @@ public class Keys {
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = ForeignKeys0.accountInventory_ibfk_2;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = ForeignKeys0.accountPolls_ibfk_1;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = ForeignKeys0.accountPolls_ibfk_2;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = ForeignKeys0.accountStat_account;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = ForeignKeys0.accountStat_stat;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = ForeignKeys0.accountStats_ibfk_1;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = ForeignKeys0.accountStats_ibfk_2;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = ForeignKeys0.ACCOUNTTASKS_ACCOUNTID;
@ -147,6 +154,8 @@ public class Keys {
public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = ForeignKeys0.clanTerritory_ibfk_2;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = ForeignKeys0.items_ibfk_1;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = ForeignKeys0.mail_ibfk_1;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = ForeignKeys0.mailbox_ibfk_1;
public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = ForeignKeys0.rankBenefits_ibfk_1;
// -------------------------------------------------------------------------
// [#1459] distribute members to avoid static initialisers > 64kb
@ -179,9 +188,11 @@ public class Keys {
public static org.jooq.Identity<mineplex.database.tables.records.ItemCategoriesRecord, java.lang.Integer> IDENTITY_itemCategories = createIdentity(mineplex.database.tables.ItemCategories.itemCategories, mineplex.database.tables.ItemCategories.itemCategories.id);
public static org.jooq.Identity<mineplex.database.tables.records.ItemsRecord, java.lang.Integer> IDENTITY_items = createIdentity(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
public static org.jooq.Identity<mineplex.database.tables.records.MailRecord, java.lang.Integer> IDENTITY_mail = createIdentity(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
public static org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> IDENTITY_mailbox = createIdentity(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
public static org.jooq.Identity<mineplex.database.tables.records.NpcsRecord, java.lang.Integer> IDENTITY_npcs = createIdentity(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
public static org.jooq.Identity<mineplex.database.tables.records.PlayerMapRecord, java.lang.Integer> IDENTITY_playerMap = createIdentity(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
public static org.jooq.Identity<mineplex.database.tables.records.PollsRecord, java.lang.Integer> IDENTITY_polls = createIdentity(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
public static org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> IDENTITY_rankBenefits = createIdentity(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
public static org.jooq.Identity<mineplex.database.tables.records.ServerPasswordRecord, java.lang.Integer> IDENTITY_serverPassword = createIdentity(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
public static org.jooq.Identity<mineplex.database.tables.records.SpawnsRecord, java.lang.Integer> IDENTITY_spawns = createIdentity(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
public static org.jooq.Identity<mineplex.database.tables.records.StatEventsRecord, org.jooq.types.UInteger> IDENTITY_statEvents = createIdentity(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
@ -205,6 +216,7 @@ public class Keys {
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountPreferencesRecord> KEY_accountPreferences_uuid_index = createUniqueKey(mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences.uuid);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_PRIMARY = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountsRecord> KEY_accounts_uuidIndex = createUniqueKey(mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts.uuid);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> KEY_accountStat_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId, mineplex.database.tables.AccountStat.accountStat.statId);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatsRecord> KEY_accountStats_PRIMARY = createUniqueKey(mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTasksRecord> KEY_accountTasks_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.AccountTransactionsRecord> KEY_accountTransactions_PRIMARY = createUniqueKey(mineplex.database.tables.AccountTransactions.accountTransactions, mineplex.database.tables.AccountTransactions.accountTransactions.id);
@ -231,10 +243,12 @@ public class Keys {
public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_PRIMARY = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.ItemsRecord> KEY_items_uniqueNameCategoryIndex = createUniqueKey(mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.name, mineplex.database.tables.Items.items.categoryId);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailRecord> KEY_mail_PRIMARY = createUniqueKey(mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> KEY_mailbox_PRIMARY = createUniqueKey(mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.NpcsRecord> KEY_npcs_PRIMARY = createUniqueKey(mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_PRIMARY = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.PlayerMapRecord> KEY_playerMap_playerIndex = createUniqueKey(mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap.playerName);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.PollsRecord> KEY_polls_PRIMARY = createUniqueKey(mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> KEY_rankBenefits_PRIMARY = createUniqueKey(mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.ServerPasswordRecord> KEY_serverPassword_PRIMARY = createUniqueKey(mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.SpawnsRecord> KEY_spawns_PRIMARY = createUniqueKey(mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns.id);
public static final org.jooq.UniqueKey<mineplex.database.tables.records.StatEventsRecord> KEY_statEvents_PRIMARY = createUniqueKey(mineplex.database.tables.StatEvents.statEvents, mineplex.database.tables.StatEvents.statEvents.eventId);
@ -259,6 +273,8 @@ public class Keys {
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountInventoryRecord, mineplex.database.tables.records.ItemsRecord> accountInventory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_items_PRIMARY, mineplex.database.tables.AccountInventory.accountInventory, mineplex.database.tables.AccountInventory.accountInventory.itemId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.AccountsRecord> accountPolls_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.accountId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountPollsRecord, mineplex.database.tables.records.PollsRecord> accountPolls_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_polls_PRIMARY, mineplex.database.tables.AccountPolls.accountPolls, mineplex.database.tables.AccountPolls.accountPolls.pollId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.AccountsRecord> accountStat_account = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.accountId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, mineplex.database.tables.records.StatsRecord> accountStat_stat = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStat.accountStat, mineplex.database.tables.AccountStat.accountStat.statId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.AccountsRecord> accountStats_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.accountId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatsRecord, mineplex.database.tables.records.StatsRecord> accountStats_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_stats_PRIMARY, mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats.statId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.AccountTasksRecord, mineplex.database.tables.records.AccountsRecord> ACCOUNTTASKS_ACCOUNTID = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks.accountId);
@ -275,5 +291,7 @@ public class Keys {
public static final org.jooq.ForeignKey<mineplex.database.tables.records.ClanTerritoryRecord, mineplex.database.tables.records.ClanServerRecord> clanTerritory_ibfk_2 = createForeignKey(mineplex.database.Keys.KEY_clanServer_PRIMARY, mineplex.database.tables.ClanTerritory.clanTerritory, mineplex.database.tables.ClanTerritory.clanTerritory.serverId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.ItemsRecord, mineplex.database.tables.records.ItemCategoriesRecord> items_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_itemCategories_PRIMARY, mineplex.database.tables.Items.items, mineplex.database.tables.Items.items.categoryId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailRecord, mineplex.database.tables.records.AccountsRecord> mail_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail.accountId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, mineplex.database.tables.records.AccountsRecord> mailbox_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.Mailbox.mailbox, mineplex.database.tables.Mailbox.mailbox.accountId);
public static final org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, mineplex.database.tables.records.AccountsRecord> rankBenefits_ibfk_1 = createForeignKey(mineplex.database.Keys.KEY_accounts_PRIMARY, mineplex.database.tables.RankBenefits.rankBenefits, mineplex.database.tables.RankBenefits.rankBenefits.accountId);
}
}

41
Plugins/Mineplex.Database/src/mineplex/database/Routines.java
View File

@ -16,14 +16,39 @@ package mineplex.database;
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Routines {
/**
* Call <code>Account.accountGoldChange</code>
*/
public static java.lang.Byte callAccountgoldchange(org.jooq.Configuration configuration, java.lang.Integer accountId, java.lang.Integer goldChange) {
mineplex.database.routines.AccountGoldChange p = new mineplex.database.routines.AccountGoldChange();
p.setAccountId(accountId);
p.setGoldChange(goldChange);
p.execute(configuration);
return p.getSuccess();
}
/**
* Call <code>Account.check_daily</code>
*/
public static mineplex.database.routines.Check_daily callCheckDaily(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coins_change, java.lang.Integer gems_change) {
public static mineplex.database.routines.Check_daily callCheckDaily(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
mineplex.database.routines.Check_daily p = new mineplex.database.routines.Check_daily();
p.setAccountId_in(accountId_in);
p.setCoins_change(coins_change);
p.setGems_change(gems_change);
p.setCoinsChange(coinsChange);
p.setGemsChange(gemsChange);
p.execute(configuration);
return p;
}
/**
* Call <code>Account.check_rank</code>
*/
public static mineplex.database.routines.Check_rank callCheckRank(org.jooq.Configuration configuration, java.lang.Integer accountId_in, java.lang.Integer coinsChange, java.lang.Integer gemsChange) {
mineplex.database.routines.Check_rank p = new mineplex.database.routines.Check_rank();
p.setAccountId_in(accountId_in);
p.setCoinsChange(coinsChange);
p.setGemsChange(gemsChange);
p.execute(configuration);
return p;
@ -117,6 +142,16 @@ public class Routines {
p.execute(configuration);
}
/**
* Call <code>Account.testPro</code>
*/
public static java.sql.Date callTestpro(org.jooq.Configuration configuration) {
mineplex.database.routines.TestPro p = new mineplex.database.routines.TestPro();
p.execute(configuration);
return p.getVar();
}
/**
* Call <code>Account.updateTournament</code>
*/

15
Plugins/Mineplex.Database/src/mineplex/database/Tables.java
View File

@ -61,6 +61,11 @@ public class Tables {
*/
public static final mineplex.database.tables.Accounts accounts = mineplex.database.tables.Accounts.accounts;
/**
* The table Account.accountStat
*/
public static final mineplex.database.tables.AccountStat accountStat = mineplex.database.tables.AccountStat.accountStat;
/**
* The table Account.accountStats
*/
@ -156,6 +161,11 @@ public class Tables {
*/
public static final mineplex.database.tables.Mail mail = mineplex.database.tables.Mail.mail;
/**
* The table Account.mailbox
*/
public static final mineplex.database.tables.Mailbox mailbox = mineplex.database.tables.Mailbox.mailbox;
/**
* The table Account.npcs
*/
@ -171,6 +181,11 @@ public class Tables {
*/
public static final mineplex.database.tables.Polls polls = mineplex.database.tables.Polls.polls;
/**
* The table Account.rankBenefits
*/
public static final mineplex.database.tables.RankBenefits rankBenefits = mineplex.database.tables.RankBenefits.rankBenefits;
/**
* The table Account.serverPassword
*/

67
Plugins/Mineplex.Database/src/mineplex/database/routines/AccountGoldChange.java Normal file
View File

@ -0,0 +1,67 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.routines;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class AccountGoldChange extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = 360483639;
/**
* The parameter <code>Account.accountGoldChange.accountId</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> accountId = createParameter("accountId", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.accountGoldChange.goldChange</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> goldChange = createParameter("goldChange", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.accountGoldChange.success</code>.
*/
public static final org.jooq.Parameter<java.lang.Byte> success = createParameter("success", org.jooq.impl.SQLDataType.TINYINT, false);
/**
* Create a new routine call instance
*/
public AccountGoldChange() {
super("accountGoldChange", mineplex.database.Account.Account);
addInParameter(accountId);
addInParameter(goldChange);
addOutParameter(success);
}
/**
* Set the <code>accountId</code> parameter IN value to the routine
*/
public void setAccountId(java.lang.Integer value) {
setValue(mineplex.database.routines.AccountGoldChange.accountId, value);
}
/**
* Set the <code>goldChange</code> parameter IN value to the routine
*/
public void setGoldChange(java.lang.Integer value) {
setValue(mineplex.database.routines.AccountGoldChange.goldChange, value);
}
/**
* Get the <code>success</code> parameter OUT value from the routine
*/
public java.lang.Byte getSuccess() {
return getValue(success);
}
}

26
Plugins/Mineplex.Database/src/mineplex/database/routines/Check_daily.java
View File

@ -16,7 +16,7 @@ package mineplex.database.routines;
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = -1106680609;
private static final long serialVersionUID = -1266580733;
/**
* The parameter <code>Account.check_daily.accountId_in</code>.
@ -24,14 +24,14 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.check_daily.coins_change</code>.
* The parameter <code>Account.check_daily.coinsChange</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> coins_change = createParameter("coins_change", org.jooq.impl.SQLDataType.INTEGER, false);
public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.check_daily.gems_change</code>.
* The parameter <code>Account.check_daily.gemsChange</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> gems_change = createParameter("gems_change", org.jooq.impl.SQLDataType.INTEGER, false);
public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.check_daily.pass</code>.
@ -50,8 +50,8 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
super("check_daily", mineplex.database.Account.Account);
addInParameter(accountId_in);
addInParameter(coins_change);
addInParameter(gems_change);
addInParameter(coinsChange);
addInParameter(gemsChange);
addOutParameter(pass);
addOutParameter(outTime);
}
@ -64,17 +64,17 @@ public class Check_daily extends org.jooq.impl.AbstractRoutine<java.lang.Void> i
}
/**
* Set the <code>coins_change</code> parameter IN value to the routine
* Set the <code>coinsChange</code> parameter IN value to the routine
*/
public void setCoins_change(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_daily.coins_change, value);
public void setCoinsChange(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_daily.coinsChange, value);
}
/**
* Set the <code>gems_change</code> parameter IN value to the routine
* Set the <code>gemsChange</code> parameter IN value to the routine
*/
public void setGems_change(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_daily.gems_change, value);
public void setGemsChange(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_daily.gemsChange, value);
}
/**

93
Plugins/Mineplex.Database/src/mineplex/database/routines/Check_rank.java Normal file
View File

@ -0,0 +1,93 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.routines;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Check_rank extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = -1491579372;
/**
* The parameter <code>Account.check_rank.accountId_in</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> accountId_in = createParameter("accountId_in", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.check_rank.coinsChange</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> coinsChange = createParameter("coinsChange", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.check_rank.gemsChange</code>.
*/
public static final org.jooq.Parameter<java.lang.Integer> gemsChange = createParameter("gemsChange", org.jooq.impl.SQLDataType.INTEGER, false);
/**
* The parameter <code>Account.check_rank.pass</code>.
*/
public static final org.jooq.Parameter<java.lang.Byte> pass = createParameter("pass", org.jooq.impl.SQLDataType.TINYINT, false);
/**
* The parameter <code>Account.check_rank.outTime</code>.
*/
public static final org.jooq.Parameter<java.sql.Date> outTime = createParameter("outTime", org.jooq.impl.SQLDataType.DATE, false);
/**
* Create a new routine call instance
*/
public Check_rank() {
super("check_rank", mineplex.database.Account.Account);
addInParameter(accountId_in);
addInParameter(coinsChange);
addInParameter(gemsChange);
addOutParameter(pass);
addOutParameter(outTime);
}
/**
* Set the <code>accountId_in</code> parameter IN value to the routine
*/
public void setAccountId_in(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_rank.accountId_in, value);
}
/**
* Set the <code>coinsChange</code> parameter IN value to the routine
*/
public void setCoinsChange(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_rank.coinsChange, value);
}
/**
* Set the <code>gemsChange</code> parameter IN value to the routine
*/
public void setGemsChange(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_rank.gemsChange, value);
}
/**
* Get the <code>pass</code> parameter OUT value from the routine
*/
public java.lang.Byte getPass() {
return getValue(pass);
}
/**
* Get the <code>outTime</code> parameter OUT value from the routine
*/
public java.sql.Date getOutTime() {
return getValue(outTime);
}
}

41
Plugins/Mineplex.Database/src/mineplex/database/routines/TestPro.java Normal file
View File

@ -0,0 +1,41 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.routines;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class TestPro extends org.jooq.impl.AbstractRoutine<java.lang.Void> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = -418397480;
/**
* The parameter <code>Account.testPro.var</code>.
*/
public static final org.jooq.Parameter<java.sql.Date> var = createParameter("var", org.jooq.impl.SQLDataType.DATE, false);
/**
* Create a new routine call instance
*/
public TestPro() {
super("testPro", mineplex.database.Account.Account);
addOutParameter(var);
}
/**
* Get the <code>var</code> parameter OUT value from the routine
*/
public java.sql.Date getVar() {
return getValue(var);
}
}

109
Plugins/Mineplex.Database/src/mineplex/database/tables/AccountStat.java Normal file
View File

@ -0,0 +1,109 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class AccountStat extends org.jooq.impl.TableImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = 956897097;
/**
* The reference instance of <code>Account.accountStat</code>
*/
public static final mineplex.database.tables.AccountStat accountStat = new mineplex.database.tables.AccountStat();
/**
* The class holding records for this type
*/
@Override
public java.lang.Class<mineplex.database.tables.records.AccountStatRecord> getRecordType() {
return mineplex.database.tables.records.AccountStatRecord.class;
}
/**
* The column <code>Account.accountStat.accountId</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>Account.accountStat.statId</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Integer> statId = createField("statId", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>Account.accountStat.value</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.AccountStatRecord, java.lang.Long> value = createField("value", org.jooq.impl.SQLDataType.BIGINT.defaulted(true), this, "");
/**
* Create a <code>Account.accountStat</code> table reference
*/
public AccountStat() {
this("accountStat", null);
}
/**
* Create an aliased <code>Account.accountStat</code> table reference
*/
public AccountStat(java.lang.String alias) {
this(alias, mineplex.database.tables.AccountStat.accountStat);
}
private AccountStat(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountStatRecord> aliased) {
this(alias, aliased, null);
}
private AccountStat(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.AccountStatRecord> aliased, org.jooq.Field<?>[] parameters) {
super(alias, mineplex.database.Account.Account, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord> getPrimaryKey() {
return mineplex.database.Keys.KEY_accountStat_PRIMARY;
}
/**
* {@inheritDoc}
*/
@Override
public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord>> getKeys() {
return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.AccountStatRecord>>asList(mineplex.database.Keys.KEY_accountStat_PRIMARY);
}
/**
* {@inheritDoc}
*/
@Override
public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, ?>> getReferences() {
return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.AccountStatRecord, ?>>asList(mineplex.database.Keys.accountStat_account, mineplex.database.Keys.accountStat_stat);
}
/**
* {@inheritDoc}
*/
@Override
public mineplex.database.tables.AccountStat as(java.lang.String alias) {
return new mineplex.database.tables.AccountStat(alias, this);
}
/**
* Rename this table
*/
public mineplex.database.tables.AccountStat rename(java.lang.String name) {
return new mineplex.database.tables.AccountStat(name, null);
}
}

4
Plugins/Mineplex.Database/src/mineplex/database/tables/Bonus.java
View File

@ -16,7 +16,7 @@ package mineplex.database.tables;
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = -1950407601;
private static final long serialVersionUID = -70389593;
/**
* The reference instance of <code>Account.bonus</code>
@ -44,7 +44,7 @@ public class Bonus extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
/**
* The column <code>Account.bonus.ranktime</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Timestamp> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.TIMESTAMP, this, "");
public final org.jooq.TableField<mineplex.database.tables.records.BonusRecord, java.sql.Date> ranktime = createField("ranktime", org.jooq.impl.SQLDataType.DATE, this, "");
/**
* Create a <code>Account.bonus</code> table reference

27
Plugins/Mineplex.Database/src/mineplex/database/tables/Clans.java
View File

@ -16,7 +16,7 @@ package mineplex.database.tables;
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = -194264445;
private static final long serialVersionUID = -1842631086;
/**
* The reference instance of <code>Account.clans</code>
@ -76,6 +76,31 @@ public class Clans extends org.jooq.impl.TableImpl<mineplex.database.tables.reco
*/
public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> energy = createField("energy", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
/**
* The column <code>Account.clans.kills</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> kills = createField("kills", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
/**
* The column <code>Account.clans.murder</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> murder = createField("murder", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
/**
* The column <code>Account.clans.deaths</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> deaths = createField("deaths", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
/**
* The column <code>Account.clans.warWins</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> warWins = createField("warWins", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
/**
* The column <code>Account.clans.warLosses</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.ClansRecord, java.lang.Integer> warLosses = createField("warLosses", org.jooq.impl.SQLDataType.INTEGER.nullable(false).defaulted(true), this, "");
/**
* Create a <code>Account.clans</code> table reference
*/

137
Plugins/Mineplex.Database/src/mineplex/database/tables/Mailbox.java Normal file
View File

@ -0,0 +1,137 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Mailbox extends org.jooq.impl.TableImpl<mineplex.database.tables.records.MailboxRecord> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = 581316209;
/**
* The reference instance of <code>Account.mailbox</code>
*/
public static final mineplex.database.tables.Mailbox mailbox = new mineplex.database.tables.Mailbox();
/**
* The class holding records for this type
*/
@Override
public java.lang.Class<mineplex.database.tables.records.MailboxRecord> getRecordType() {
return mineplex.database.tables.records.MailboxRecord.class;
}
/**
* The column <code>Account.mailbox.id</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>Account.mailbox.accountId</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>Account.mailbox.sender</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.String> sender = createField("sender", org.jooq.impl.SQLDataType.VARCHAR.length(64), this, "");
/**
* The column <code>Account.mailbox.message</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.String> message = createField("message", org.jooq.impl.SQLDataType.VARCHAR.length(1024), this, "");
/**
* The column <code>Account.mailbox.archived</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Byte> archived = createField("archived", org.jooq.impl.SQLDataType.TINYINT, this, "");
/**
* The column <code>Account.mailbox.deleted</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.lang.Byte> deleted = createField("deleted", org.jooq.impl.SQLDataType.TINYINT, this, "");
/**
* The column <code>Account.mailbox.timeSent</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.MailboxRecord, java.sql.Timestamp> timeSent = createField("timeSent", org.jooq.impl.SQLDataType.TIMESTAMP.nullable(false).defaulted(true), this, "");
/**
* Create a <code>Account.mailbox</code> table reference
*/
public Mailbox() {
this("mailbox", null);
}
/**
* Create an aliased <code>Account.mailbox</code> table reference
*/
public Mailbox(java.lang.String alias) {
this(alias, mineplex.database.tables.Mailbox.mailbox);
}
private Mailbox(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.MailboxRecord> aliased) {
this(alias, aliased, null);
}
private Mailbox(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.MailboxRecord> aliased, org.jooq.Field<?>[] parameters) {
super(alias, mineplex.database.Account.Account, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Identity<mineplex.database.tables.records.MailboxRecord, java.lang.Integer> getIdentity() {
return mineplex.database.Keys.IDENTITY_mailbox;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord> getPrimaryKey() {
return mineplex.database.Keys.KEY_mailbox_PRIMARY;
}
/**
* {@inheritDoc}
*/
@Override
public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord>> getKeys() {
return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.MailboxRecord>>asList(mineplex.database.Keys.KEY_mailbox_PRIMARY);
}
/**
* {@inheritDoc}
*/
@Override
public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, ?>> getReferences() {
return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.MailboxRecord, ?>>asList(mineplex.database.Keys.mailbox_ibfk_1);
}
/**
* {@inheritDoc}
*/
@Override
public mineplex.database.tables.Mailbox as(java.lang.String alias) {
return new mineplex.database.tables.Mailbox(alias, this);
}
/**
* Rename this table
*/
public mineplex.database.tables.Mailbox rename(java.lang.String name) {
return new mineplex.database.tables.Mailbox(name, null);
}
}

117
Plugins/Mineplex.Database/src/mineplex/database/tables/RankBenefits.java Normal file
View File

@ -0,0 +1,117 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.tables;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class RankBenefits extends org.jooq.impl.TableImpl<mineplex.database.tables.records.RankBenefitsRecord> implements java.io.Serializable, java.lang.Cloneable {
private static final long serialVersionUID = 1274456623;
/**
* The reference instance of <code>Account.rankBenefits</code>
*/
public static final mineplex.database.tables.RankBenefits rankBenefits = new mineplex.database.tables.RankBenefits();
/**
* The class holding records for this type
*/
@Override
public java.lang.Class<mineplex.database.tables.records.RankBenefitsRecord> getRecordType() {
return mineplex.database.tables.records.RankBenefitsRecord.class;
}
/**
* The column <code>Account.rankBenefits.id</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> id = createField("id", org.jooq.impl.SQLDataType.INTEGER.nullable(false), this, "");
/**
* The column <code>Account.rankBenefits.accountId</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> accountId = createField("accountId", org.jooq.impl.SQLDataType.INTEGER, this, "");
/**
* The column <code>Account.rankBenefits.benefit</code>.
*/
public final org.jooq.TableField<mineplex.database.tables.records.RankBenefitsRecord, java.lang.String> benefit = createField("benefit", org.jooq.impl.SQLDataType.VARCHAR.length(100), this, "");
/**
* Create a <code>Account.rankBenefits</code> table reference
*/
public RankBenefits() {
this("rankBenefits", null);
}
/**
* Create an aliased <code>Account.rankBenefits</code> table reference
*/
public RankBenefits(java.lang.String alias) {
this(alias, mineplex.database.tables.RankBenefits.rankBenefits);
}
private RankBenefits(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RankBenefitsRecord> aliased) {
this(alias, aliased, null);
}
private RankBenefits(java.lang.String alias, org.jooq.Table<mineplex.database.tables.records.RankBenefitsRecord> aliased, org.jooq.Field<?>[] parameters) {
super(alias, mineplex.database.Account.Account, aliased, parameters, "");
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Identity<mineplex.database.tables.records.RankBenefitsRecord, java.lang.Integer> getIdentity() {
return mineplex.database.Keys.IDENTITY_rankBenefits;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord> getPrimaryKey() {
return mineplex.database.Keys.KEY_rankBenefits_PRIMARY;
}
/**
* {@inheritDoc}
*/
@Override
public java.util.List<org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord>> getKeys() {
return java.util.Arrays.<org.jooq.UniqueKey<mineplex.database.tables.records.RankBenefitsRecord>>asList(mineplex.database.Keys.KEY_rankBenefits_PRIMARY);
}
/**
* {@inheritDoc}
*/
@Override
public java.util.List<org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, ?>> getReferences() {
return java.util.Arrays.<org.jooq.ForeignKey<mineplex.database.tables.records.RankBenefitsRecord, ?>>asList(mineplex.database.Keys.rankBenefits_ibfk_1);
}
/**
* {@inheritDoc}
*/
@Override
public mineplex.database.tables.RankBenefits as(java.lang.String alias) {
return new mineplex.database.tables.RankBenefits(alias, this);
}
/**
* Rename this table
*/
public mineplex.database.tables.RankBenefits rename(java.lang.String name) {
return new mineplex.database.tables.RankBenefits(name, null);
}
}

199
Plugins/Mineplex.Database/src/mineplex/database/tables/records/AccountStatRecord.java Normal file
View File

@ -0,0 +1,199 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.tables.records;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class AccountStatRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.AccountStatRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.Long> {
private static final long serialVersionUID = 1109290129;
/**
* Setter for <code>Account.accountStat.accountId</code>.
*/
public void setAccountId(java.lang.Integer value) {
setValue(0, value);
}
/**
* Getter for <code>Account.accountStat.accountId</code>.
*/
public java.lang.Integer getAccountId() {
return (java.lang.Integer) getValue(0);
}
/**
* Setter for <code>Account.accountStat.statId</code>.
*/
public void setStatId(java.lang.Integer value) {
setValue(1, value);
}
/**
* Getter for <code>Account.accountStat.statId</code>.
*/
public java.lang.Integer getStatId() {
return (java.lang.Integer) getValue(1);
}
/**
* Setter for <code>Account.accountStat.value</code>.
*/
public void setValue(java.lang.Long value) {
setValue(2, value);
}
/**
* Getter for <code>Account.accountStat.value</code>.
*/
public java.lang.Long getValue() {
return (java.lang.Long) getValue(2);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Record2<java.lang.Integer, java.lang.Integer> key() {
return (org.jooq.Record2) super.key();
}
// -------------------------------------------------------------------------
// Record3 type implementation
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> fieldsRow() {
return (org.jooq.Row3) super.fieldsRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.Long> valuesRow() {
return (org.jooq.Row3) super.valuesRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field1() {
return mineplex.database.tables.AccountStat.accountStat.accountId;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field2() {
return mineplex.database.tables.AccountStat.accountStat.statId;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Long> field3() {
return mineplex.database.tables.AccountStat.accountStat.value;
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value1() {
return getAccountId();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value2() {
return getStatId();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Long value3() {
return getValue();
}
/**
* {@inheritDoc}
*/
@Override
public AccountStatRecord value1(java.lang.Integer value) {
setAccountId(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public AccountStatRecord value2(java.lang.Integer value) {
setStatId(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public AccountStatRecord value3(java.lang.Long value) {
setValue(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public AccountStatRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.Long value3) {
return this;
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached AccountStatRecord
*/
public AccountStatRecord() {
super(mineplex.database.tables.AccountStat.accountStat);
}
/**
* Create a detached, initialised AccountStatRecord
*/
public AccountStatRecord(java.lang.Integer accountId, java.lang.Integer statId, java.lang.Long value) {
super(mineplex.database.tables.AccountStat.accountStat);
setValue(0, accountId);
setValue(1, statId);
setValue(2, value);
}
}

24
Plugins/Mineplex.Database/src/mineplex/database/tables/records/BonusRecord.java
View File

@ -14,9 +14,9 @@ package mineplex.database.tables.records;
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> {
public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.BonusRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> {
private static final long serialVersionUID = 1527068906;
private static final long serialVersionUID = -64019858;
/**
* Setter for <code>Account.bonus.accountId</code>.
@ -49,15 +49,15 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
/**
* Setter for <code>Account.bonus.ranktime</code>.
*/
public void setRanktime(java.sql.Timestamp value) {
public void setRanktime(java.sql.Date value) {
setValue(2, value);
}
/**
* Getter for <code>Account.bonus.ranktime</code>.
*/
public java.sql.Timestamp getRanktime() {
return (java.sql.Timestamp) getValue(2);
public java.sql.Date getRanktime() {
return (java.sql.Date) getValue(2);
}
// -------------------------------------------------------------------------
@ -80,7 +80,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> fieldsRow() {
public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> fieldsRow() {
return (org.jooq.Row3) super.fieldsRow();
}
@ -88,7 +88,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Timestamp> valuesRow() {
public org.jooq.Row3<java.lang.Integer, java.sql.Timestamp, java.sql.Date> valuesRow() {
return (org.jooq.Row3) super.valuesRow();
}
@ -112,7 +112,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.sql.Timestamp> field3() {
public org.jooq.Field<java.sql.Date> field3() {
return mineplex.database.tables.Bonus.bonus.ranktime;
}
@ -136,7 +136,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public java.sql.Timestamp value3() {
public java.sql.Date value3() {
return getRanktime();
}
@ -162,7 +162,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public BonusRecord value3(java.sql.Timestamp value) {
public BonusRecord value3(java.sql.Date value) {
setRanktime(value);
return this;
}
@ -171,7 +171,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Timestamp value3) {
public BonusRecord values(java.lang.Integer value1, java.sql.Timestamp value2, java.sql.Date value3) {
return this;
}
@ -189,7 +189,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
/**
* Create a detached, initialised BonusRecord
*/
public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Timestamp ranktime) {
public BonusRecord(java.lang.Integer accountId, java.sql.Timestamp dailytime, java.sql.Date ranktime) {
super(mineplex.database.tables.Bonus.bonus);
setValue(0, accountId);

218
Plugins/Mineplex.Database/src/mineplex/database/tables/records/ClansRecord.java
View File

@ -14,9 +14,9 @@ package mineplex.database.tables.records;
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> {
public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.ClansRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> {
private static final long serialVersionUID = -1803774546;
private static final long serialVersionUID = -1588610871;
/**
* Setter for <code>Account.clans.id</code>.
@ -144,6 +144,76 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
return (java.lang.Integer) getValue(8);
}
/**
* Setter for <code>Account.clans.kills</code>.
*/
public void setKills(java.lang.Integer value) {
setValue(9, value);
}
/**
* Getter for <code>Account.clans.kills</code>.
*/
public java.lang.Integer getKills() {
return (java.lang.Integer) getValue(9);
}
/**
* Setter for <code>Account.clans.murder</code>.
*/
public void setMurder(java.lang.Integer value) {
setValue(10, value);
}
/**
* Getter for <code>Account.clans.murder</code>.
*/
public java.lang.Integer getMurder() {
return (java.lang.Integer) getValue(10);
}
/**
* Setter for <code>Account.clans.deaths</code>.
*/
public void setDeaths(java.lang.Integer value) {
setValue(11, value);
}
/**
* Getter for <code>Account.clans.deaths</code>.
*/
public java.lang.Integer getDeaths() {
return (java.lang.Integer) getValue(11);
}
/**
* Setter for <code>Account.clans.warWins</code>.
*/
public void setWarWins(java.lang.Integer value) {
setValue(12, value);
}
/**
* Getter for <code>Account.clans.warWins</code>.
*/
public java.lang.Integer getWarWins() {
return (java.lang.Integer) getValue(12);
}
/**
* Setter for <code>Account.clans.warLosses</code>.
*/
public void setWarLosses(java.lang.Integer value) {
setValue(13, value);
}
/**
* Getter for <code>Account.clans.warLosses</code>.
*/
public java.lang.Integer getWarLosses() {
return (java.lang.Integer) getValue(13);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
@ -157,23 +227,23 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
}
// -------------------------------------------------------------------------
// Record9 type implementation
// Record14 type implementation
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> fieldsRow() {
return (org.jooq.Row9) super.fieldsRow();
public org.jooq.Row14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> fieldsRow() {
return (org.jooq.Row14) super.fieldsRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row9<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer> valuesRow() {
return (org.jooq.Row9) super.valuesRow();
public org.jooq.Row14<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String, java.lang.Boolean, java.sql.Timestamp, java.sql.Timestamp, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer, java.lang.Integer> valuesRow() {
return (org.jooq.Row14) super.valuesRow();
}
/**
@ -248,6 +318,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
return mineplex.database.tables.Clans.clans.energy;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field10() {
return mineplex.database.tables.Clans.clans.kills;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field11() {
return mineplex.database.tables.Clans.clans.murder;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field12() {
return mineplex.database.tables.Clans.clans.deaths;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field13() {
return mineplex.database.tables.Clans.clans.warWins;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field14() {
return mineplex.database.tables.Clans.clans.warLosses;
}
/**
* {@inheritDoc}
*/
@ -320,6 +430,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
return getEnergy();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value10() {
return getKills();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value11() {
return getMurder();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value12() {
return getDeaths();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value13() {
return getWarWins();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value14() {
return getWarLosses();
}
/**
* {@inheritDoc}
*/
@ -405,7 +555,52 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc}
*/
@Override
public ClansRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Boolean value6, java.sql.Timestamp value7, java.sql.Timestamp value8, java.lang.Integer value9) {
public ClansRecord value10(java.lang.Integer value) {
setKills(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public ClansRecord value11(java.lang.Integer value) {
setMurder(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public ClansRecord value12(java.lang.Integer value) {
setDeaths(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public ClansRecord value13(java.lang.Integer value) {
setWarWins(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public ClansRecord value14(java.lang.Integer value) {
setWarLosses(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public ClansRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.String value5, java.lang.Boolean value6, java.sql.Timestamp value7, java.sql.Timestamp value8, java.lang.Integer value9, java.lang.Integer value10, java.lang.Integer value11, java.lang.Integer value12, java.lang.Integer value13, java.lang.Integer value14) {
return this;
}
@ -423,7 +618,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
/**
* Create a detached, initialised ClansRecord
*/
public ClansRecord(java.lang.Integer id, java.lang.Integer serverId, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Boolean admin, java.sql.Timestamp dateCreated, java.sql.Timestamp lastOnline, java.lang.Integer energy) {
public ClansRecord(java.lang.Integer id, java.lang.Integer serverId, java.lang.String name, java.lang.String description, java.lang.String home, java.lang.Boolean admin, java.sql.Timestamp dateCreated, java.sql.Timestamp lastOnline, java.lang.Integer energy, java.lang.Integer kills, java.lang.Integer murder, java.lang.Integer deaths, java.lang.Integer warWins, java.lang.Integer warLosses) {
super(mineplex.database.tables.Clans.clans);
setValue(0, id);
@ -435,5 +630,10 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
setValue(6, dateCreated);
setValue(7, lastOnline);
setValue(8, energy);
setValue(9, kills);
setValue(10, murder);
setValue(11, deaths);
setValue(12, warWins);
setValue(13, warLosses);
}
}

359
Plugins/Mineplex.Database/src/mineplex/database/tables/records/MailboxRecord.java Normal file
View File

@ -0,0 +1,359 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.tables.records;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class MailboxRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.MailboxRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> {
private static final long serialVersionUID = 763437590;
/**
* Setter for <code>Account.mailbox.id</code>.
*/
public void setId(java.lang.Integer value) {
setValue(0, value);
}
/**
* Getter for <code>Account.mailbox.id</code>.
*/
public java.lang.Integer getId() {
return (java.lang.Integer) getValue(0);
}
/**
* Setter for <code>Account.mailbox.accountId</code>.
*/
public void setAccountId(java.lang.Integer value) {
setValue(1, value);
}
/**
* Getter for <code>Account.mailbox.accountId</code>.
*/
public java.lang.Integer getAccountId() {
return (java.lang.Integer) getValue(1);
}
/**
* Setter for <code>Account.mailbox.sender</code>.
*/
public void setSender(java.lang.String value) {
setValue(2, value);
}
/**
* Getter for <code>Account.mailbox.sender</code>.
*/
public java.lang.String getSender() {
return (java.lang.String) getValue(2);
}
/**
* Setter for <code>Account.mailbox.message</code>.
*/
public void setMessage(java.lang.String value) {
setValue(3, value);
}
/**
* Getter for <code>Account.mailbox.message</code>.
*/
public java.lang.String getMessage() {
return (java.lang.String) getValue(3);
}
/**
* Setter for <code>Account.mailbox.archived</code>.
*/
public void setArchived(java.lang.Byte value) {
setValue(4, value);
}
/**
* Getter for <code>Account.mailbox.archived</code>.
*/
public java.lang.Byte getArchived() {
return (java.lang.Byte) getValue(4);
}
/**
* Setter for <code>Account.mailbox.deleted</code>.
*/
public void setDeleted(java.lang.Byte value) {
setValue(5, value);
}
/**
* Getter for <code>Account.mailbox.deleted</code>.
*/
public java.lang.Byte getDeleted() {
return (java.lang.Byte) getValue(5);
}
/**
* Setter for <code>Account.mailbox.timeSent</code>.
*/
public void setTimeSent(java.sql.Timestamp value) {
setValue(6, value);
}
/**
* Getter for <code>Account.mailbox.timeSent</code>.
*/
public java.sql.Timestamp getTimeSent() {
return (java.sql.Timestamp) getValue(6);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Record1<java.lang.Integer> key() {
return (org.jooq.Record1) super.key();
}
// -------------------------------------------------------------------------
// Record7 type implementation
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> fieldsRow() {
return (org.jooq.Row7) super.fieldsRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row7<java.lang.Integer, java.lang.Integer, java.lang.String, java.lang.String, java.lang.Byte, java.lang.Byte, java.sql.Timestamp> valuesRow() {
return (org.jooq.Row7) super.valuesRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field1() {
return mineplex.database.tables.Mailbox.mailbox.id;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field2() {
return mineplex.database.tables.Mailbox.mailbox.accountId;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.String> field3() {
return mineplex.database.tables.Mailbox.mailbox.sender;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.String> field4() {
return mineplex.database.tables.Mailbox.mailbox.message;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Byte> field5() {
return mineplex.database.tables.Mailbox.mailbox.archived;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Byte> field6() {
return mineplex.database.tables.Mailbox.mailbox.deleted;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.sql.Timestamp> field7() {
return mineplex.database.tables.Mailbox.mailbox.timeSent;
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value1() {
return getId();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value2() {
return getAccountId();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.String value3() {
return getSender();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.String value4() {
return getMessage();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Byte value5() {
return getArchived();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Byte value6() {
return getDeleted();
}
/**
* {@inheritDoc}
*/
@Override
public java.sql.Timestamp value7() {
return getTimeSent();
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value1(java.lang.Integer value) {
setId(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value2(java.lang.Integer value) {
setAccountId(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value3(java.lang.String value) {
setSender(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value4(java.lang.String value) {
setMessage(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value5(java.lang.Byte value) {
setArchived(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value6(java.lang.Byte value) {
setDeleted(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord value7(java.sql.Timestamp value) {
setTimeSent(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public MailboxRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3, java.lang.String value4, java.lang.Byte value5, java.lang.Byte value6, java.sql.Timestamp value7) {
return this;
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached MailboxRecord
*/
public MailboxRecord() {
super(mineplex.database.tables.Mailbox.mailbox);
}
/**
* Create a detached, initialised MailboxRecord
*/
public MailboxRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String sender, java.lang.String message, java.lang.Byte archived, java.lang.Byte deleted, java.sql.Timestamp timeSent) {
super(mineplex.database.tables.Mailbox.mailbox);
setValue(0, id);
setValue(1, accountId);
setValue(2, sender);
setValue(3, message);
setValue(4, archived);
setValue(5, deleted);
setValue(6, timeSent);
}
}

199
Plugins/Mineplex.Database/src/mineplex/database/tables/records/RankBenefitsRecord.java Normal file
View File

@ -0,0 +1,199 @@
/**
* This class is generated by jOOQ
*/
package mineplex.database.tables.records;
/**
* This class is generated by jOOQ.
*/
@javax.annotation.Generated(
value = {
"http://www.jooq.org",
"jOOQ version:3.5.2"
},
comments = "This class is generated by jOOQ"
)
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class RankBenefitsRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.database.tables.records.RankBenefitsRecord> implements java.io.Serializable, java.lang.Cloneable, org.jooq.Record3<java.lang.Integer, java.lang.Integer, java.lang.String> {
private static final long serialVersionUID = 1205523956;
/**
* Setter for <code>Account.rankBenefits.id</code>.
*/
public void setId(java.lang.Integer value) {
setValue(0, value);
}
/**
* Getter for <code>Account.rankBenefits.id</code>.
*/
public java.lang.Integer getId() {
return (java.lang.Integer) getValue(0);
}
/**
* Setter for <code>Account.rankBenefits.accountId</code>.
*/
public void setAccountId(java.lang.Integer value) {
setValue(1, value);
}
/**
* Getter for <code>Account.rankBenefits.accountId</code>.
*/
public java.lang.Integer getAccountId() {
return (java.lang.Integer) getValue(1);
}
/**
* Setter for <code>Account.rankBenefits.benefit</code>.
*/
public void setBenefit(java.lang.String value) {
setValue(2, value);
}
/**
* Getter for <code>Account.rankBenefits.benefit</code>.
*/
public java.lang.String getBenefit() {
return (java.lang.String) getValue(2);
}
// -------------------------------------------------------------------------
// Primary key information
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Record1<java.lang.Integer> key() {
return (org.jooq.Record1) super.key();
}
// -------------------------------------------------------------------------
// Record3 type implementation
// -------------------------------------------------------------------------
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.String> fieldsRow() {
return (org.jooq.Row3) super.fieldsRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Row3<java.lang.Integer, java.lang.Integer, java.lang.String> valuesRow() {
return (org.jooq.Row3) super.valuesRow();
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field1() {
return mineplex.database.tables.RankBenefits.rankBenefits.id;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.Integer> field2() {
return mineplex.database.tables.RankBenefits.rankBenefits.accountId;
}
/**
* {@inheritDoc}
*/
@Override
public org.jooq.Field<java.lang.String> field3() {
return mineplex.database.tables.RankBenefits.rankBenefits.benefit;
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value1() {
return getId();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.Integer value2() {
return getAccountId();
}
/**
* {@inheritDoc}
*/
@Override
public java.lang.String value3() {
return getBenefit();
}
/**
* {@inheritDoc}
*/
@Override
public RankBenefitsRecord value1(java.lang.Integer value) {
setId(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public RankBenefitsRecord value2(java.lang.Integer value) {
setAccountId(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public RankBenefitsRecord value3(java.lang.String value) {
setBenefit(value);
return this;
}
/**
* {@inheritDoc}
*/
@Override
public RankBenefitsRecord values(java.lang.Integer value1, java.lang.Integer value2, java.lang.String value3) {
return this;
}
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
/**
* Create a detached RankBenefitsRecord
*/
public RankBenefitsRecord() {
super(mineplex.database.tables.RankBenefits.rankBenefits);
}
/**
* Create a detached, initialised RankBenefitsRecord
*/
public RankBenefitsRecord(java.lang.Integer id, java.lang.Integer accountId, java.lang.String benefit) {
super(mineplex.database.tables.RankBenefits.rankBenefits);
setValue(0, id);
setValue(1, accountId);
setValue(2, benefit);
}
}

2
Plugins/Mineplex.Hub/src/mineplex/hub/HubManager.java
View File

@ -318,7 +318,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
+ "§r\n"
+ "§lHow do I apply for Trainee?\n"
+ "\n"
+ "§rYou may only apply for Helper if you have §bUltra§0, §5Hero§0, or §aLegend§0.\n"
+ "§rYou may only apply for Trainee if you have §bUltra§0, §5Hero§0, or §aLegend§0.\n"
+ "Apply at:\n"
+ "§omineplex.com/application\n");

27
Plugins/Mineplex.Hub/src/mineplex/hub/HubRepository.java
View File

@ -33,33 +33,6 @@ public class HubRepository
public void initialize(boolean us)
{
_us = us;
PreparedStatement preparedStatement = null;
try (Connection connection = DBPool.MINEPLEX.getConnection())
{
// Create table
preparedStatement = connection.prepareStatement(CREATE_NEWS_TABLE);
preparedStatement.execute();
}
catch (Exception exception)
{
exception.printStackTrace();
}
finally
{
if (preparedStatement != null)
{
try
{
preparedStatement.close();
}
catch (SQLException e)
{
e.printStackTrace();
}
}
}
}
public HashMap<String, String> retrieveNewsEntries()

4
Plugins/Mineplex.Hub/src/mineplex/hub/poll/PollManager.java
View File

@ -11,10 +11,10 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.java.JavaPlugin;
import net.minecraft.server.v1_7_R4.ChatSerializer;
import net.minecraft.server.v1_7_R4.PacketPlayOutChat;
import net.minecraft.util.com.google.gson.JsonObject;
import mineplex.core.MiniDbClientPlugin;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank;
@ -212,7 +212,7 @@ public class PollManager extends MiniDbClientPlugin<PlayerPollData>
}
@Override
public void processLoginResultSet(String playerName, ResultSet resultSet) throws SQLException
public void processLoginResultSet(String playerName, int accountId, ResultSet resultSet) throws SQLException
{
Set(playerName, _repository.loadPollData(resultSet));
}

2
Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java
View File

@ -64,7 +64,7 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
ChatColor.RESET + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("BR") + ChatColor.RESET + " other players!",
}));
setItem(2, ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Survival Games " + C.cGray + "Last Man Standing", new String[]
setItem(2, ItemStackFactory.Instance.CreateStack(Material.IRON_SWORD.getId(), (byte)0, 1, ChatColor.RESET + C.Bold + ChatColor.YELLOW + "Survival Games " + C.cGray + "Last Man Standing", new String[]
{
ChatColor.RESET + "",
ChatColor.RESET + "Search for chests to find loot and ",

4
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Brute/BlockToss.java
View File

@ -137,7 +137,7 @@ public class BlockToss extends SkillCharge implements IThrown
}
//Block to Item
FallingBlock block = player.getWorld().spawnFallingBlock(player.getEyeLocation(), event.getClickedBlock().getType(), (byte)0);
FallingBlock block = player.getWorld().spawnFallingBlock(player.getEyeLocation(), event.getClickedBlock().getType(), event.getClickedBlock().getData());
//Action
player.eject();
@ -242,7 +242,7 @@ public class BlockToss extends SkillCharge implements IThrown
{
FallingBlock thrown = (FallingBlock) data.GetThrown();
FallingBlock newThrown = data.GetThrown().getWorld().spawnFallingBlock(data.GetThrown().getLocation(), thrown.getMaterial(), (byte)0);
FallingBlock newThrown = data.GetThrown().getWorld().spawnFallingBlock(data.GetThrown().getLocation(), thrown.getMaterial(), thrown.getBlockData());
//Remove Old
_falling.remove(thrown);

2
Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Mage/Rupture.java
View File

@ -68,7 +68,7 @@ public class Rupture extends SkillActiveCharge
"",
"Release Block to release the rupture,",
"causing earth and players to fly upward,",
"dealing up to #4#1 inital damage."
"dealing up to #4#1 initial damage."
});
}

2
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/command/GemHunterCommand.java
View File

@ -33,7 +33,7 @@ public class GemHunterCommand extends CommandBase<SalesPackageManager>
else if (amount == 8)
tempExp = 220000;
final int experience = tempExp;
final long experience = tempExp;
Plugin.getClientManager().loadClientByName(playerName, new Runnable()
{

17
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java
View File

@ -31,6 +31,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.ServerListPingEvent;
import org.bukkit.potion.PotionEffect;
import org.bukkit.util.Vector;
import com.google.common.base.Objects;
@ -103,7 +104,7 @@ import nautilus.game.arcade.addons.TeamArmorAddon;
import nautilus.game.arcade.command.DisguiseCommand;
import nautilus.game.arcade.command.GameCommand;
import nautilus.game.arcade.command.WriteCommand;
import nautilus.game.arcade.command.YoutubeCommand;
import nautilus.game.arcade.command.KitUnlockCommand;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState;
@ -407,7 +408,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{
addCommand(new GameCommand(this));
addCommand(new WriteCommand(this));
addCommand(new YoutubeCommand(this));
addCommand(new KitUnlockCommand(this));
addCommand(new DisguiseCommand(this));
}
@ -840,6 +841,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{
player.setGameMode(GameMode.SURVIVAL);
player.setAllowFlight(false);
player.setFlySpeed(0.1F);
UtilInv.Clear(player);
((CraftEntity) player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0));
@ -871,6 +874,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
//Remove all conditions
GetCondition().EndCondition(player, null, null);
for (PotionEffect potion : player.getActivePotionEffects())
player.removePotionEffect(potion.getType());
HubClock(player);
@ -1207,21 +1212,21 @@ public class ArcadeManager extends MiniPlugin implements IRelation
return _game != null && _game.InProgress();
}
public boolean isYoutuber(Player player)
public boolean hasKitsUnlocked(Player player)
{
return _youtube.contains(player);
}
public void setYoutuber(Player caller)
public void toggleUnlockKits(Player caller)
{
if (_youtube.remove(caller))
{
UtilPlayer.message(caller, C.cRed + C.Bold + "YouTube Mode Disabled: " + ChatColor.RESET + "Kits Locked");
UtilPlayer.message(caller, C.cRed + C.Bold + "Celebrity Mode Disabled: " + ChatColor.RESET + "Kits Locked");
}
else
{
_youtube.add(caller);
UtilPlayer.message(caller, C.cGreen + C.Bold + "YouTube Mode Enabled: " + ChatColor.RESET + "All Kits Unlocked");
UtilPlayer.message(caller, C.cGreen + C.Bold + "Celebrity Mode Enabled: " + ChatColor.RESET + "All Kits Unlocked");
}
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
View File

@ -26,6 +26,7 @@ import nautilus.game.arcade.game.games.halloween.Halloween;
import nautilus.game.arcade.game.games.hideseek.HideSeek;
import nautilus.game.arcade.game.games.holeinwall.HoleInTheWall;
import nautilus.game.arcade.game.games.horsecharge.Horse;
import nautilus.game.arcade.game.games.lobbers.BombLobbers;
import nautilus.game.arcade.game.games.micro.Micro;
import nautilus.game.arcade.game.games.milkcow.MilkCow;
import nautilus.game.arcade.game.games.minestrike.MineStrike;
@ -84,6 +85,7 @@ public enum GameType
HideSeek(HideSeek.class, GameDisplay.HideSeek),
HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
Horse(Horse.class, GameDisplay.Horse),
Lobbers(BombLobbers.class, GameDisplay.Lobbers),
Micro(Micro.class, GameDisplay.Micro),
MilkCow(MilkCow.class, GameDisplay.MilkCow),
MineStrike(MineStrike.class, GameDisplay.MineStrike, "http://chivebox.com/file/c/assets.zip", true),// Temp set to CHAMPIONS to fix UI bug
@ -112,7 +114,7 @@ public enum GameType
TurfWars(TurfForts.class, GameDisplay.TurfWars),
UHC(UHC.class, GameDisplay.UHC),
WitherAssault(WitherGame.class, GameDisplay.WitherAssault),
Wizards(Wizards.class, GameDisplay.Barbarians.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
Wizards(Wizards.class, GameDisplay.Wizards, "http://chivebox.com/file/c/ResWizards.zip", true),
ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
Build(Build.class, GameDisplay.Build),

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/addons/SoupAddon.java
View File

@ -40,6 +40,9 @@ public class SoupAddon extends MiniPlugin
Player player = event.getPlayer();
if (!Manager.GetGame().IsAlive(player))
return;
if (!UtilGear.isMat(player.getItemInHand(), Material.MUSHROOM_SOUP))
return;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/GameCommand.java
View File

@ -12,7 +12,7 @@ public class GameCommand extends MultiCommandBase<ArcadeManager>
{
public GameCommand(ArcadeManager plugin)
{
super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.MAPLEAD, Rank.JNR_DEV}, "game");
super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "game");
AddCommand(new StartCommand(Plugin));
AddCommand(new StopCommand(Plugin));

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/YoutubeCommand.java → Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/KitUnlockCommand.java
View File

@ -6,16 +6,16 @@ import nautilus.game.arcade.ArcadeManager;
import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank;
public class YoutubeCommand extends CommandBase<ArcadeManager>
public class KitUnlockCommand extends CommandBase<ArcadeManager>
{
public YoutubeCommand(ArcadeManager plugin)
public KitUnlockCommand(ArcadeManager plugin)
{
super(plugin, Rank.OWNER, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, new String[] {"youtube", "twitch"});
super(plugin, Rank.OWNER, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, new String[] {"youtube", "twitch", "kits"});
}
@Override
public void Execute(Player caller, String[] args)
{
Plugin.setYoutuber(caller);
Plugin.toggleUnlockKits(caller);
}
}

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java
View File

@ -18,7 +18,7 @@ public class SetCommand extends CommandBase<ArcadeManager>
{
public SetCommand(ArcadeManager plugin)
{
super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.MAPLEAD, Rank.JNR_DEV}, "set");
super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "set");
}
@Override

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StartCommand.java
View File

@ -12,7 +12,7 @@ public class StartCommand extends CommandBase<ArcadeManager>
{
public StartCommand(ArcadeManager plugin)
{
super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.MAPLEAD, Rank.JNR_DEV}, "start");
super(plugin, Rank.ADMIN, new Rank[] {Rank.MAPLEAD, Rank.JNR_DEV}, "start");
}
@Override

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBeserker.java
View File

@ -20,7 +20,7 @@ public class KitBeserker extends Kit
new String[]
{
"Agile warrior trained in the ways axe combat."
"Agile warrior trained in the ways of axe combat."
},
new Perk[]

10
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/BuildData.java
View File

@ -98,7 +98,15 @@ public class BuildData
return false;
}
Particles.put(Player.getEyeLocation().add(Player.getLocation().getDirection()), particleType);
Location toPlace = Player.getEyeLocation().add(Player.getLocation().getDirection());
if (!inBuildArea(toPlace.getBlock()))
{
UtilPlayer.message(Player, F.main("Game", "You cannot place particles outside your plot!"));
return false;
}
Particles.put(toPlace, particleType);
UtilPlayer.message(Player, F.main("Game", "You placed " + particleType.getFriendlyName() + "!"));

565
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombLobbers.java Normal file
View File

@ -0,0 +1,565 @@
package nautilus.game.arcade.game.games.lobbers;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Map.Entry;
import mineplex.core.common.util.F;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.explosion.ExplosionEvent;
import mineplex.core.projectile.IThrown;
import mineplex.core.projectile.ProjectileUser;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.combat.CombatComponent;
import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.TeamGame;
import nautilus.game.arcade.game.games.lobbers.events.TNTPreExplodeEvent;
import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
import nautilus.game.arcade.game.games.lobbers.kits.KitArmorer;
import nautilus.game.arcade.game.games.lobbers.kits.KitPitcher;
import nautilus.game.arcade.game.games.lobbers.kits.KitJumper;
import nautilus.game.arcade.game.games.lobbers.kits.KitWaller;
import nautilus.game.arcade.game.games.lobbers.trackers.Tracker6Kill;
import nautilus.game.arcade.game.games.lobbers.trackers.TrackerBestTeam;
import nautilus.game.arcade.game.games.lobbers.trackers.TrackerBlastProof;
import nautilus.game.arcade.game.games.lobbers.trackers.TrackerNoDamage;
import nautilus.game.arcade.game.games.lobbers.trackers.TrackerTNTThrown;
import nautilus.game.arcade.kit.Kit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.ExplosionPrimeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.util.Vector;
public class BombLobbers extends TeamGame implements IThrown
{
/**
* @author Mysticate
* Created in July, 2015
*/
private NautHashMap<GameTeam, Location> _averageSpawns = new NautHashMap<GameTeam, Location>();
private NautHashMap<TNTPrimed, BombToken> _tnt = new NautHashMap<TNTPrimed, BombToken>();
private NautHashMap<Player, Double> _kills = new NautHashMap<Player, Double>();
@SuppressWarnings("unchecked")
public BombLobbers(ArcadeManager manager)
{
super(manager, GameType.Lobbers, new Kit[]
{
new KitJumper(manager),
new KitArmorer(manager),
new KitPitcher(manager),
// new KitMortar(manager), << Spare time kit for Bobbeh
new KitWaller(manager)
}, new String[]
{
"Fight against your enemies using",
"the power of explosives!",
"Left click TNT to throw at your enemy.",
"Last team alive wins!"
});
DamageFall = true;
DamageEvP = true;
WorldWaterDamage = 5;
PrepareFreeze = false;
TeamArmor = true;
TeamArmorHotbar = true;
InventoryOpenChest = false;
InventoryOpenBlock = false;
ItemDrop = false;
BlockPlace = false;
Manager.GetExplosion().SetLiquidDamage(false);
HungerSet = 20;
registerStatTrackers(new Tracker6Kill(this), new TrackerBestTeam(this), new TrackerBlastProof(this), new TrackerNoDamage(this), new TrackerTNTThrown(this));
}
public void addKill(Player player)
{
_kills.put(player, _kills.containsKey(player) ? _kills.get(player) + 1 : 1);
}
public void addAssist(Player player)
{
_kills.put(player, _kills.containsKey(player) ? _kills.get(player) + .5 : .5);
}
public double getKills(Player player)
{
if (_kills.containsKey(player))
{
return _kills.get(player);
}
else
{
_kills.put(player, 0.0);
return 0;
}
}
@EventHandler
public void onKill(CombatDeathEvent event)
{
if (!IsLive())
return;
Player dead = UtilPlayer.searchExact(((Player) event.GetEvent().getEntity()).getName());
if (!IsAlive(dead))
return;
for (CombatComponent damager : event.GetLog().GetAttackers())
{
Player killer = UtilPlayer.searchExact(damager.GetName());
if (killer == null || !killer.isOnline())
continue;
if (IsAlive(killer))
{
if (event.GetLog().GetKiller() == damager)
{
addKill(killer);
}
else
{
addAssist(killer);
}
}
}
}
@EventHandler
public void loadTeamLocations(GameStateChangeEvent event)
{
if (event.GetState() == GameState.Live)
{
for (GameTeam team : _teamList)
{
_averageSpawns.put(team, UtilAlg.getAverageLocation(team.GetSpawns()));
}
}
}
@EventHandler
public void disableFlying(GameStateChangeEvent event)
{
for (Player player : GetPlayers(true))
{
player.setAllowFlight(false);
}
}
@EventHandler
public void throwTNT(PlayerInteractEvent event)
{
if (event.getAction() == Action.PHYSICAL)
return;
if (!IsLive())
return;
Player player = event.getPlayer();
if (!IsAlive(player))
return;
if (!UtilInv.IsItem(player.getItemInHand(), Material.TNT, (byte) 0))
return;
event.setCancelled(true);
UtilInv.remove(player, Material.TNT, (byte) 0, 1);
UtilInv.Update(player);
TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
tnt.setFuseTicks(60);
UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
Manager.GetProjectile().AddThrow(tnt, player, this, -1L, true, false, true, .2F);
Manager.getPlugin().getServer().getPluginManager().callEvent(new TNTThrowEvent(player, tnt));
_tnt.put(tnt, new BombToken(player));
}
public Player getThrower(TNTPrimed tnt)
{
if (_tnt.get(tnt) == null)
return null;
return UtilPlayer.searchExact(_tnt.get(tnt).Thrower);
}
@EventHandler
public void onTNTExplode(ExplosionPrimeEvent event)
{
if (!IsLive())
return;
if (!(event.getEntity() instanceof TNTPrimed))
return;
TNTPrimed tnt = (TNTPrimed) event.getEntity();
if (!_tnt.containsKey(tnt))
return;
Player thrower = UtilPlayer.searchExact(_tnt.get(tnt).Thrower);
if (thrower == null)
{
event.setCancelled(true);
_tnt.remove(tnt);
event.getEntity().remove();
return;
}
if (GetTeam(thrower) == getSide(tnt.getLocation()))
{
event.setCancelled(true);
_tnt.remove(tnt);
event.getEntity().remove();
return;
}
TNTPreExplodeEvent preExplode = new TNTPreExplodeEvent(thrower, tnt);
Manager.getPlugin().getServer().getPluginManager().callEvent(preExplode);
if (preExplode.isCancelled())
{
event.setCancelled(true);
tnt.remove();
}
else
{
for (Player other : UtilPlayer.getNearby(event.getEntity().getLocation(), 14))
{
Manager.GetCondition().Factory().Explosion("Throwing TNT", other, thrower, 50, 0.1, false, false);
}
}
_tnt.remove(tnt);
}
@EventHandler
public void updateTNT(UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
return;
if (!IsLive())
return;
Iterator<Entry<TNTPrimed, BombToken>> iterator = _tnt.entrySet().iterator();
while (iterator.hasNext())
{
Entry<TNTPrimed, BombToken> tnt = iterator.next();
if (tnt.getKey() == null)
continue;
if (!tnt.getKey().isValid())
continue;
BombToken token = tnt.getValue();
Player thrower = UtilPlayer.searchExact(token.Thrower);
if (thrower == null)
continue;
if (!IsPlaying(thrower))
continue;
if (!token.Primed)
{
if (tnt.getKey().getFuseTicks() <= 20)
{
//Respawn
TNTPrimed newTNT = tnt.getKey().getWorld().spawn(tnt.getKey().getLocation(), TNTPrimed.class);
newTNT.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), thrower.getUniqueId()));
newTNT.setVelocity(tnt.getKey().getVelocity());
newTNT.setFuseTicks(60);
Manager.GetProjectile().AddThrow(newTNT, thrower, this, -1L, true, false, true, .2F);
tnt.getKey().remove();
iterator.remove();
_tnt.put(newTNT, token);
}
}
}
}
@EventHandler
public void blockCollision(UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
return;
if (!IsLive())
return;
for (Entry<TNTPrimed, BombToken> tnt : _tnt.entrySet())
{
if (tnt.getKey() == null)
continue;
if (!tnt.getKey().isValid())
continue;
BombToken token = tnt.getValue();
Player thrower = UtilPlayer.searchExact(token.Thrower);
if (thrower == null)
continue;
if (!IsPlaying(thrower))
continue;
if (!token.Primed)
{
//8+ insta explode
if (UtilTime.elapsed(token.Created, 8000))
{
token.Primed = true;
tnt.getKey().setFuseTicks(0);
continue;
}
else if (UtilTime.elapsed(token.Created, 3000))
{
for (Block block : UtilBlock.getSurrounding(tnt.getKey().getLocation().getBlock(), true))
{
if (block.getType() != Material.AIR)
{
token.Primed = true;
tnt.getKey().setFuseTicks(0);
break;
}
}
}
}
}
}
@EventHandler
public void updateParticles(UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
return;
if (!IsLive())
return;
for (Entry<TNTPrimed, BombToken> tnt : _tnt.entrySet())
{
if (tnt.getKey() == null)
continue;
if (!tnt.getKey().isValid())
continue;
if (UtilEnt.isGrounded(tnt.getKey()) || tnt.getKey().isOnGround())
continue;
BombToken token = tnt.getValue();
Player thrower = UtilPlayer.searchExact(token.Thrower);
if (thrower == null)
continue;
if (!IsPlaying(thrower))
continue;
GameTeam team = GetTeam(thrower);
if (team == null)
continue;
//A is current
//B is previous
token.B = token.A;
token.A = tnt.getKey().getLocation();
if (token.A == null || token.B == null)
continue;
//Adapted from static lazer code
double curRange = 0;
double distance = Math.abs(token.A.distance(token.B));
while (curRange <= distance)
{
Location newTarget = token.B.add(UtilAlg.getTrajectory(token.B, token.A).multiply(curRange));
// Location newTarget = player.getEyeLocation().add(player.getLocation().getDirection().multiply(curRange));
//Progress Forwards
curRange += 0.2;
if (team.GetColor() == ChatColor.AQUA)
{
for (int i = 0 ; i < 5 ; i++)
UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), -1, 1, 1, 1, 0,
ViewDist.LONG, UtilServer.getPlayers());
}
else
{
for (int i = 0 ; i < 5 ; i++)
UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.5, 0.0), 0, 0, 0, 0, 1,
ViewDist.LONG, UtilServer.getPlayers());
}
//UtilParticle.PlayParticle(ParticleType.RED_DUST, newTarget.clone().add(0.0, 0.6, 0.0), team.GetColorBase().getRed(), team.GetColorBase().getGreen(), team.GetColorBase().getBlue(), 1, 0, ViewDist.LONG, UtilServer.getPlayers());
}
}
}
@EventHandler
public void preventCheating(UpdateEvent event)
{
if (event.getType() != UpdateType.TICK)
return;
if (!IsLive())
return;
for (Player player : GetPlayers(true))
{
if (GetTeam(player) != getSide(player.getLocation()))
{
player.damage(500);
UtilPlayer.message(player, F.main("Game", "You were killed for trying to cheat!"));
}
}
}
@SuppressWarnings("deprecation")
@EventHandler
public void damageBlocks(ExplosionEvent event)
{
if (!Manager.GetGame().IsLive())
return;
Iterator<Block> iterator = event.GetBlocks().iterator();
while (iterator.hasNext())
{
Block block = iterator.next();
//Stone
if (block.getType() == Material.STONE)
{
block.setType(Material.COBBLESTONE);
iterator.remove();
continue;
}
//Stone Brick
if (block.getType() == Material.SMOOTH_BRICK && block.getData() != 2)
{
block.setData((byte) 2);
iterator.remove();
continue;
}
}
}
private GameTeam getSide(Location entityLoc)
{
Location nearest = UtilAlg.findClosest(entityLoc, new ArrayList<Location>(_averageSpawns.values()));
for (Entry<GameTeam, Location> entry : _averageSpawns.entrySet())
{
if (entry.getValue().equals(nearest))
return entry.getKey();
}
return null;
}
@Override
public void Collide(LivingEntity target, Block block, ProjectileUser data)
{
if (!(data.GetThrown() instanceof TNTPrimed))
return;
if (!(data.GetThrower() instanceof Player))
return;
if (!(target instanceof Player))
return;
if (GetTeam((Player) target) == GetTeam((Player) data.GetThrower()))
return;
data.GetThrown().setVelocity(new Vector());
if (target != null)
UtilAction.velocity(target, UtilAlg.getTrajectory2d(data.GetThrown().getLocation(), target.getLocation()), .2, false, 0, 0.2, .4, true);
Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null, DamageCause.PROJECTILE, 6.0, false, false, true, "Throwing TNT", "Throwing TNT Direct Hit");
}
@Override
public void Idle(ProjectileUser data)
{
}
@Override
public void Expire(ProjectileUser data)
{
}
public void knockbackIncrease(CustomDamageEvent event)
{
if (event.GetCause() != DamageCause.ENTITY_EXPLOSION && event.GetCause() != DamageCause.BLOCK_EXPLOSION)
return;
event.AddKnockback("Explosion", 1.5D);
}
}

20
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/BombToken.java Normal file
View File

@ -0,0 +1,20 @@
package nautilus.game.arcade.game.games.lobbers;
import org.bukkit.Location;
import org.bukkit.entity.Player;
public class BombToken
{
public final long Created;
public final String Thrower;
public Location A = null;
public Location B = null;
public boolean Primed = false;
public BombToken(Player player)
{
Thrower = player.getName();
Created = System.currentTimeMillis();
}
}

52
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTPreExplodeEvent.java Normal file
View File

@ -0,0 +1,52 @@
package nautilus.game.arcade.game.games.lobbers.events;
import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.Cancellable;
import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent;
public class TNTPreExplodeEvent extends PlayerEvent implements Cancellable
{
private static final HandlerList _handlers = new HandlerList();
private boolean _cancelled = false;
private TNTPrimed _tnt;
public TNTPreExplodeEvent(Player thrower, TNTPrimed tnt)
{
super(thrower);
_tnt = tnt;
}
public TNTPrimed getTNT()
{
return _tnt;
}
@Override
public void setCancelled(boolean flag)
{
_cancelled = flag;
}
@Override
public boolean isCancelled()
{
return _cancelled;
}
public static HandlerList getHandlerList()
{
return _handlers;
}
@Override
public HandlerList getHandlers()
{
return getHandlerList();
}
}

37
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/events/TNTThrowEvent.java Normal file
View File

@ -0,0 +1,37 @@
package nautilus.game.arcade.game.games.lobbers.events;
import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.HandlerList;
import org.bukkit.event.player.PlayerEvent;
public class TNTThrowEvent extends PlayerEvent
{
private static final HandlerList _handlers = new HandlerList();
private TNTPrimed _tnt;
public TNTThrowEvent(Player thrower, TNTPrimed tnt)
{
super(thrower);
_tnt = tnt;
}
public TNTPrimed getTNT()
{
return _tnt;
}
public static HandlerList getHandlerList()
{
return _handlers;
}
@Override
public HandlerList getHandlers()
{
return getHandlerList();
}
}

69
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitArmorer.java Normal file
View File

@ -0,0 +1,69 @@
package nautilus.game.arcade.game.games.lobbers.kits;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilInv;
import mineplex.core.itemstack.ItemBuilder;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
public class KitArmorer extends Kit
{
public KitArmorer(ArcadeManager manager)
{
super(manager, "Armorer", KitAvailability.Gem, 2000, new String[]
{
"He uses his expert armor-making",
"skills to block excess damage!",
"",
C.cGray + "Recieve " + C.cYellow + "Full Gold Armor"
}, new Perk[]
{
new PerkCraftman()
}, EntityType.ZOMBIE,
new ItemStack(Material.AIR));
}
@Override
public void ApplyKit(Player player)
{
UtilInv.Clear(player);
for (Perk perk : GetPerks())
perk.Apply(player);
GiveItemsCall(player);
player.getInventory().setHelmet(new ItemBuilder(Material.GOLD_HELMET).setUnbreakable(true).build());
player.getInventory().setChestplate(new ItemBuilder(Material.GOLD_CHESTPLATE).setUnbreakable(true).build());
player.getInventory().setLeggings(new ItemBuilder(Material.GOLD_LEGGINGS).setUnbreakable(true).build());
player.getInventory().setBoots(new ItemBuilder(Material.GOLD_BOOTS).setUnbreakable(true).build());
UtilInv.Update(player);
}
@Override
public void SpawnCustom(LivingEntity ent)
{
ent.getEquipment().setHelmet(new ItemBuilder(Material.GOLD_HELMET).build());
ent.getEquipment().setChestplate(new ItemBuilder(Material.GOLD_CHESTPLATE).build());
ent.getEquipment().setLeggings(new ItemBuilder(Material.GOLD_LEGGINGS).build());
ent.getEquipment().setBoots(new ItemBuilder(Material.GOLD_BOOTS).build());
}
@Override
public void GiveItems(Player player)
{
}
}

57
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitJumper.java Normal file
View File

@ -0,0 +1,57 @@
package nautilus.game.arcade.game.games.lobbers.kits;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import nautilus.game.arcade.kit.perks.PerkDoubleJump;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
public class KitJumper extends Kit
{
public KitJumper(ArcadeManager manager)
{
super(manager, "Jumper", KitAvailability.Free, 0, new String[]
{
"Use your jumping abilities to leap away from trouble!",
"You take no fall damage."
}, new Perk[]
{
new PerkDoubleJump("Double Jump", 1.2, 1.2, false, 6000, true),
new PerkCraftman()
}, EntityType.ZOMBIE, new ItemBuilder(Material.IRON_AXE).build());
}
@Override
public void GiveItems(Player player)
{
}
@EventHandler
public void onDamage(CustomDamageEvent event)
{
if (!Manager.GetGame().IsLive())
return;
if (!(event.GetDamageeEntity() instanceof Player))
return;
if (!HasKit(event.GetDamageePlayer()))
return;
if (event.GetCause() == DamageCause.FALL)
{
event.SetCancelled("Jumper no fall damage");
}
}
}

36
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitMortar.java Normal file
View File

@ -0,0 +1,36 @@
package nautilus.game.arcade.game.games.lobbers.kits;
import mineplex.core.itemstack.ItemBuilder;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkMortar;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkMorterCraftman;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
public class KitMortar extends Kit
{
public KitMortar(ArcadeManager manager)
{
super(manager, "Mortar", KitAvailability.Gem, 6000, new String[]
{
"He loves the big guns."
}, new Perk[]
{
new PerkMortar(),
new PerkCraftman(),
new PerkMorterCraftman()
}, EntityType.ZOMBIE, new ItemBuilder(Material.FIREBALL).build());
}
@Override
public void GiveItems(Player player)
{
}
}

122
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitPitcher.java Normal file
View File

@ -0,0 +1,122 @@
package nautilus.game.arcade.game.games.lobbers.kits;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilEvent;
import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.common.util.UtilInv;
import mineplex.core.itemstack.ItemBuilder;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
public class KitPitcher extends Kit
{
public KitPitcher(ArcadeManager manager)
{
super(manager, "Pitcher", KitAvailability.Gem, 4000, new String[]
{
"He can easily pitch the perfect shot for any occasion.",
"",
C.cYellow + "Left Click" + C.cGray + " lever to " + C.cGreen + "Decrease Velocity",
C.cYellow + "Right Click" + C.cGray + " lever to " + C.cGreen + "Increase Velocity",
"Maximum Velocity of " + C.cYellow + "3.",
"Minimum Velocity of " + C.cYellow + "1.",
}, new Perk[]
{
new PerkCraftman()
}, EntityType.ZOMBIE,
new ItemBuilder(Material.LEVER).build());
}
@Override
public void GiveItems(Player player)
{
player.getInventory().setItem(1, new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).setAmount(3).build());
}
@EventHandler
public void setFuse(TNTThrowEvent event)
{
if (!Manager.GetGame().IsLive())
return;
if (!HasKit(event.getPlayer()))
return;
ItemStack lever = event.getPlayer().getInventory().getItem(1);
if (lever == null || lever.getType() == Material.AIR)
{
GiveItems(event.getPlayer());
}
else
{
if (lever.getAmount() < 1 || lever.getAmount() > 3)
{
GiveItems(event.getPlayer());
}
UtilAction.velocity(event.getTNT(), event.getPlayer().getLocation().getDirection(), getVelocity(lever.getAmount()), false, 0.0D, 0.1D, 10.0D, false);
}
}
@EventHandler
public void changeFuse(PlayerInteractEvent event)
{
if (!Manager.GetGame().IsLive())
return;
if (!Manager.IsAlive(event.getPlayer()))
return;
if (!HasKit(event.getPlayer()))
return;
if (!UtilInv.IsItem(event.getItem(), Material.LEVER, (byte) 0))
return;
int amount = event.getPlayer().getInventory().getItem(1).getAmount();
//Right
if (UtilEvent.isAction(event, ActionType.R))
{
if (amount >= 3)
return;
UtilInv.insert(event.getPlayer(), new ItemBuilder(Material.LEVER).setTitle(F.item("Velocity Selector")).build());
UtilInv.Update(event.getPlayer());
}
//Left
else if (UtilEvent.isAction(event, ActionType.L))
{
if (amount <= 1)
return;
UtilInv.remove(event.getPlayer(), Material.LEVER, (byte) 0, 1);
UtilInv.Update(event.getPlayer());
}
}
private double getVelocity(int amount)
{
if (amount == 1)
return 1.5;
if (amount == 2)
return 1.75;
return 2.0;
}
}

38
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/KitWaller.java Normal file
View File

@ -0,0 +1,38 @@
package nautilus.game.arcade.game.games.lobbers.kits;
import mineplex.core.common.util.F;
import mineplex.core.itemstack.ItemBuilder;
import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkCraftman;
import nautilus.game.arcade.game.games.lobbers.kits.perks.PerkWaller;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.KitAvailability;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
public class KitWaller extends Kit
{
public KitWaller(ArcadeManager manager)
{
super(manager, "Waller", KitAvailability.Achievement, 0, new String[]
{
"When the times get tough,",
"build yourself a wall!"
}, new Perk[]
{
new PerkWaller(),
new PerkCraftman()
}, EntityType.ZOMBIE,
new ItemBuilder(Material.SMOOTH_BRICK).setUnbreakable(true).build());
}
@Override
public void GiveItems(Player player)
{
player.getInventory().setItem(1, new ItemBuilder(Material.STONE_SPADE).setAmount(3).setTitle(F.item("Wall Builder")).build());
}
}

74
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkCraftman.java Normal file
View File

@ -0,0 +1,74 @@
package nautilus.game.arcade.game.games.lobbers.kits.perks;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilInv;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class PerkCraftman extends Perk
{
private Recharge _recharge;
public PerkCraftman()
{
super("Craftman", new String[]
{
C.cGray + "Recieve 1 TNT every so often. Maximum of 3."
}, false);
_recharge = Recharge.Instance;
}
@EventHandler
public void give(UpdateEvent event)
{
if (event.getType() != UpdateType.FAST)
return;
if (!Manager.GetGame().IsLive())
return;
for (Player player : Manager.GetGame().GetPlayers(true))
{
if (!Kit.HasKit(player))
continue;
//If game time is 56 seconds - 56000
//8 - 1
if (!_recharge.use(player, "Bomb Give", getRechargeTime(), false, false))
continue;
//Has 3
if (UtilInv.contains(player, Material.TNT, (byte) 0, 3))
continue;
UtilInv.insert(player, new ItemBuilder(Material.TNT).setTitle(F.item("Throwing TNT")).build());
}
}
private long getRechargeTime()
{
long ingame = Manager.GetGame().getGameLiveTime();
if (ingame <= 20000)
return 8000;
if (ingame <= 40000)
return 7000;
if (ingame <= 60000)
return 6000;
if (ingame <= 620000)
return 5000;
return 4000;
}
}

116
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMortar.java Normal file
View File

@ -0,0 +1,116 @@
package nautilus.game.arcade.game.games.lobbers.kits.perks;
import java.util.HashSet;
import java.util.Set;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilInv;
import nautilus.game.arcade.game.games.lobbers.BombLobbers;
import nautilus.game.arcade.game.games.lobbers.events.TNTPreExplodeEvent;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.metadata.FixedMetadataValue;
import org.bukkit.util.Vector;
public class PerkMortar extends Perk
{
private Set<TNTPrimed> _scatter = new HashSet<TNTPrimed>();
public PerkMortar()
{
super("Mortar", new String[]
{
C.cYellow + "Right Click" + C.cGray + " Fireball to " + C.cGreen + "Fire Mortar",
"Mortars will explode after " + C.cYellow + "2 Seconds",
"releasing 3 more TNT, each with a 3 second fuse.",
"Your TNT will not scatter if it is grounded."
});
}
@EventHandler
public void throwTNT(PlayerInteractEvent event)
{
if (event.getAction() == Action.PHYSICAL)
return;
if (!Manager.GetGame().IsLive())
return;
if (!(Manager.GetGame() instanceof BombLobbers))
return;
BombLobbers l = (BombLobbers) Manager.GetGame();
Player player = event.getPlayer();
if (!Manager.IsAlive(player))
return;
if (!UtilInv.IsItem(player.getItemInHand(), Material.FIREBALL, (byte) 0))
return;
event.setCancelled(true);
UtilInv.remove(player, Material.FIREBALL, (byte) 0, 1);
UtilInv.Update(player);
TNTPrimed tnt = (TNTPrimed) player.getWorld().spawn(player.getEyeLocation().add(player.getLocation().getDirection()), TNTPrimed.class);
tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), player.getUniqueId()));
tnt.setFuseTicks(40);
UtilAction.velocity(tnt, player.getLocation().getDirection(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
Manager.GetProjectile().AddThrow(tnt, player, l, -1L, true, false, false, .2F);
player.playSound(player.getLocation(), Sound.CREEPER_HISS, 3.0F, 1.0F);
// l.addThrower(player, tnt);
}
@EventHandler
public void onExplode(TNTPreExplodeEvent event)
{
if (!Manager.GetGame().IsLive())
return;
if (!Kit.HasKit(event.getPlayer()))
return;
if (event.getTNT().isOnGround() || UtilEnt.isGrounded(event.getTNT()))
return;
if (!(Manager.GetGame() instanceof BombLobbers))
return;
BombLobbers l = (BombLobbers) Manager.GetGame();
event.setCancelled(true);
if (_scatter.contains(event.getTNT()))
{
_scatter.remove(event.getTNT());
return;
}
for (int i = -1 ; i < 2 ; i++)
{
TNTPrimed tnt = (TNTPrimed) event.getTNT().getWorld().spawn(event.getTNT().getLocation(), TNTPrimed.class);
tnt.setMetadata("owner", new FixedMetadataValue(Manager.getPlugin(), event.getPlayer().getUniqueId()));
tnt.setFuseTicks(60);
UtilAction.velocity(tnt, event.getTNT().getVelocity().add(new Vector(i / 5, 0, i / 5)).normalize(), 2.0D, false, 0.0D, 0.1D, 10.0D, false);
Manager.GetProjectile().AddThrow(tnt, event.getPlayer(), l, -1L, true, false, false, .2F);
// l.addThrower(event.getPlayer(), tnt);
_scatter.add(tnt);
}
}
}

55
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkMorterCraftman.java Normal file
View File

@ -0,0 +1,55 @@
package nautilus.game.arcade.game.games.lobbers.kits.perks;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilInv;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.kit.Perk;
public class PerkMorterCraftman extends Perk
{
private Recharge _recharge;
public PerkMorterCraftman()
{
super("Morter Craftman", new String[]
{
"You will recieve 1 mortar every " + C.cYellow + "10 Seconds.",
"Maximum of 1."
});
_recharge = Recharge.Instance;
}
@EventHandler
public void give(UpdateEvent event)
{
if (event.getType() != UpdateType.FAST)
return;
if (!Manager.GetGame().IsLive())
return;
for (Player player : Manager.GetGame().GetPlayers(true))
{
if (!Kit.HasKit(player))
continue;
if (!_recharge.use(player, "Mortar Give", 10000, false, false))
continue;
//Has 1
if (UtilInv.contains(player, Material.FIREBALL, (byte) 0, 1))
continue;
UtilInv.insert(player, new ItemBuilder(Material.FIREBALL).setTitle(F.item("Mortar")).build());
}
}
}

123
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/kits/perks/PerkWaller.java Normal file
View File

@ -0,0 +1,123 @@
package nautilus.game.arcade.game.games.lobbers.kits.perks;
import java.util.HashSet;
import java.util.Set;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEvent;
import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.common.util.UtilInv;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.player.PlayerInteractEvent;
public class PerkWaller extends Perk
{
private BlockFace[] axis = { BlockFace.NORTH, BlockFace.EAST, BlockFace.SOUTH, BlockFace.WEST };
private Set<TNTPrimed> _tnt = new HashSet<TNTPrimed>();
private Set<Location> _wallBlocks = new HashSet<Location>();
public PerkWaller()
{
super("Waller", new String[]
{
C.cYellow + "Click Block" + C.cGray + " with shovel to " + C.cGreen + "Place Wall"
});
}
@EventHandler
public void onThrow(TNTThrowEvent event)
{
_tnt.add(event.getTNT());
}
@EventHandler
public void onExplode(EntityExplodeEvent event)
{
if (_tnt.contains(event.getEntity()))
{
_tnt.remove(event.getEntity());
}
}
@EventHandler
public void onPlace(PlayerInteractEvent event)
{
if (!UtilEvent.isAction(event, ActionType.R_BLOCK))
return;
if (!Manager.GetGame().IsLive())
return;
if (!Manager.IsAlive(event.getPlayer()))
return;
if (!Kit.HasKit(event.getPlayer()))
return;
if (!UtilInv.IsItem(event.getItem(), Material.STONE_SPADE, (byte) 0))
return;
UtilInv.remove(event.getPlayer(), Material.STONE_SPADE, (byte) 0, 1);
_wallBlocks.addAll(buildWall(event.getClickedBlock().getLocation(), event.getPlayer().getLocation().getYaw()));
}
@SuppressWarnings("deprecation")
private Set<Location> buildWall(final Location source, final float playerYaw)
{
BlockFace facing = getFace(playerYaw + 180F);
Set<Location> allWallBlocks = new HashSet<Location>();
Set<Location> baseWallBlocks = new HashSet<Location>();
Location centerWallBlock = source.getBlock().getRelative(facing).getRelative(BlockFace.UP).getLocation();
float leftYaw = playerYaw - 90;
float rightYaw = playerYaw + 90;
BlockFace leftSide = getFace(leftYaw);
BlockFace rightSide = getFace(rightYaw);
baseWallBlocks.add(centerWallBlock.getBlock().getRelative(leftSide).getRelative(leftSide).getLocation());
baseWallBlocks.add(centerWallBlock.getBlock().getRelative(leftSide).getLocation());
baseWallBlocks.add(centerWallBlock);
baseWallBlocks.add(centerWallBlock.getBlock().getRelative(rightSide).getLocation());
baseWallBlocks.add(centerWallBlock.getBlock().getRelative(rightSide).getRelative(rightSide).getLocation());
for (Location base : baseWallBlocks)
{
for (int height = 0 ; height < 3 ; height++)
{
allWallBlocks.add(base.clone().add(0, height, 0));
}
}
for (Location block : allWallBlocks)
{
block.getBlock().setType(Material.SMOOTH_BRICK);
block.getBlock().setData((byte) 0);
block.getWorld().playEffect(block, Effect.STEP_SOUND, block.getBlock().getType());
}
return allWallBlocks;
}
private BlockFace getFace(float yaw)
{
return axis[Math.round(yaw / 90f) & 0x3];
}
}

38
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/Tracker6Kill.java Normal file
View File

@ -0,0 +1,38 @@
package nautilus.game.arcade.game.games.lobbers.trackers;
import mineplex.core.common.util.UtilServer;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.games.lobbers.BombLobbers;
import nautilus.game.arcade.stats.StatTracker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class Tracker6Kill extends StatTracker<Game>
{
public Tracker6Kill(Game game)
{
super(game);
}
@EventHandler
public void onEndgame(GameStateChangeEvent event)
{
if (event.GetState() != GameState.End)
return;
if (getGame() instanceof BombLobbers)
{
for (Player player : UtilServer.getPlayers())
{
if (((BombLobbers) getGame()).getKills(player) >= 6.0)
{
addStat(player, "Killer", 1, true, false);
}
}
}
}
}

51
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBestTeam.java Normal file
View File

@ -0,0 +1,51 @@
package nautilus.game.arcade.game.games.lobbers.trackers;
import mineplex.core.common.util.NautHashMap;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.stats.StatTracker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class TrackerBestTeam extends StatTracker<Game>
{
private NautHashMap<GameTeam, Integer> _teams = new NautHashMap<GameTeam, Integer>();
public TrackerBestTeam(Game game)
{
super(game);
}
@EventHandler
public void onGameStart(GameStateChangeEvent event)
{
if (event.GetState() != GameState.Prepare)
return;
for (GameTeam team : getGame().GetTeamList())
{
_teams.put(team, team.GetPlayers(true).size());
}
}
@EventHandler
public void onGameEnd(GameStateChangeEvent event)
{
if (event.GetState() != GameState.End)
return;
for (GameTeam team : getGame().GetTeamList())
{
if (_teams.get(team) == team.GetPlayers(true).size())
{
for (Player player : team.GetPlayers(true))
{
addStat(player, "BestTeam", 1, true, false);
}
}
}
}
}

38
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerBlastProof.java Normal file
View File

@ -0,0 +1,38 @@
package nautilus.game.arcade.game.games.lobbers.trackers;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.game.games.lobbers.kits.KitArmorer;
import nautilus.game.arcade.stats.StatTracker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class TrackerBlastProof extends StatTracker<Game>
{
public TrackerBlastProof(Game game)
{
super(game);
}
@EventHandler(priority = EventPriority.MONITOR)
public void onGameEnd(GameStateChangeEvent event)
{
if (event.GetState() != GameState.End)
return;
if (getGame().getWinners() == null)
return;
for (Player winner : getGame().getWinners())
{
if (getGame().GetKit(winner) instanceof KitArmorer)
{
addStat(winner, "BlastProof", 1, false, false);
}
}
}
}

69
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerNoDamage.java Normal file
View File

@ -0,0 +1,69 @@
package nautilus.game.arcade.game.games.lobbers.trackers;
import java.util.HashSet;
import java.util.Set;
import mineplex.core.common.util.UtilPlayer;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState;
import nautilus.game.arcade.stats.StatTracker;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class TrackerNoDamage extends StatTracker<Game>
{
private Set<String> _noDamage = new HashSet<String>();
public TrackerNoDamage(Game game)
{
super(game);
}
@EventHandler
public void onGameStart(GameStateChangeEvent event)
{
if (event.GetState() != GameState.Prepare)
return;
for (Player player : getGame().GetPlayers(true))
{
_noDamage.add(player.getName());
}
}
@EventHandler
public void onGameEnd(GameStateChangeEvent event)
{
if (event.GetState() != GameState.End)
return;
for (String name : _noDamage)
{
Player player = UtilPlayer.searchExact(name);
if (player == null || !player.isOnline())
continue;
addStat(player, "JellySkin", 1, true, false);
}
}
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
public void onDamage(CustomDamageEvent event)
{
if (!getGame().IsLive())
return;
if (event.GetDamageePlayer() == null || !event.GetDamageePlayer().isOnline())
return;
if (_noDamage.contains(event.GetDamageePlayer().getName()))
{
_noDamage.remove(event.GetDamageePlayer().getName());
}
}
}

26
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/lobbers/trackers/TrackerTNTThrown.java Normal file
View File

@ -0,0 +1,26 @@
package nautilus.game.arcade.game.games.lobbers.trackers;
import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.games.lobbers.events.TNTThrowEvent;
import nautilus.game.arcade.stats.StatTracker;
import org.bukkit.event.EventHandler;
public class TrackerTNTThrown extends StatTracker<Game>
{
public TrackerTNTThrown(Game game)
{
super(game);
}
@EventHandler
public void onThrow(TNTThrowEvent event)
{
if (!getGame().IsLive())
return;
addStat(event.getPlayer(), "Thrown", 1, false, false);
}
}

11
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java
View File

@ -1924,8 +1924,19 @@ public class MineStrike extends TeamGame
Announce(color + "===================================", false);
for (Player player : UtilServer.getPlayers())
{
player.playSound(player.getLocation(), Sound.LEVEL_UP, 1f, 1f);
//Clear reloading things
for (String recharge : Recharge.Instance.Get(player).keySet())
{
if (!recharge.toLowerCase().contains("reload"))
continue;
Recharge.Instance.recharge(player, recharge);
}
}
UtilTextMiddle.display(null, winnerLine, 20, 120, 20);
//Check for total game win

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
View File

@ -6,7 +6,6 @@ import java.util.HashSet;
import java.util.Iterator;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.MapUtil;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilAction;
@ -25,7 +24,6 @@ import mineplex.core.common.util.UtilTextMiddle;
import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilTime.TimeUnit;
import mineplex.core.explosion.ExplosionEvent;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.loot.ChestLoot;
import mineplex.core.loot.RandomItem;
import mineplex.core.updater.UpdateType;
@ -43,8 +41,8 @@ import nautilus.game.arcade.game.games.skywars.data.TNTGenerator;
import nautilus.game.arcade.game.games.skywars.events.PlayerKillZombieEvent;
import nautilus.game.arcade.game.games.skywars.kits.KitChicken;
import nautilus.game.arcade.game.games.skywars.kits.KitDestructor;
import nautilus.game.arcade.game.games.skywars.kits.KitMiner;
import nautilus.game.arcade.game.games.skywars.kits.KitMadScientist;
import nautilus.game.arcade.game.games.skywars.kits.KitMiner;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.ore.OreHider;
import nautilus.game.arcade.stats.DeathBomberStatTracker;
@ -67,7 +65,6 @@ import org.bukkit.entity.Chicken;
import org.bukkit.entity.Egg;
import org.bukkit.entity.EnderPearl;
import org.bukkit.entity.Entity;
import org.bukkit.entity.Item;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/SuperSmash.java
View File

@ -172,7 +172,7 @@ public class SuperSmash extends SoloGame
if (lives > 0)
{
UtilPlayer.message(player, C.cRed + C.Bold + "You have died!");
UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives + " lives left!");
UtilPlayer.message(player, C.cRed + C.Bold + "You have " + lives + (lives == 1 ? "life" : "lives") + " left!");
player.playSound(player.getLocation(), Sound.NOTE_BASS_GUITAR, 2f, 0.5f);
_lives.put(player, lives);

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java
View File

@ -40,7 +40,7 @@ public class KitChicken extends SmashKit
},
EntityType.CHICKEN,
new ItemStack(Material.EGG),
"Airial Gunner", 20000, Sound.CHICKEN_HURT);
"Aerial Gunner", 20000, Sound.CHICKEN_HURT);
}

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSheep.java
View File

@ -76,7 +76,7 @@ public class KitSheep extends SmashKit
{
ChatColor.RESET + "Shear yourself and use the wool as",
ChatColor.RESET + "an explosive device. You can Right-Click",
ChatColor.RESET + "as second time to solidify the bomb, and",
ChatColor.RESET + "a second time to solidify the bomb, and",
ChatColor.RESET + "a third time to detonate it on command.",
}));
@ -98,7 +98,7 @@ public class KitSheep extends SmashKit
{
ChatColor.RESET + "Release one Homing Sheeple towards every player.",
ChatColor.RESET + "They will slowly home in on their target and",
ChatColor.RESET + "explode to deal devestating damage.",
ChatColor.RESET + "explode to deal devastating damage.",
}));
player.getInventory().setChestplate(ItemStackFactory.Instance.CreateStack(Material.CHAINMAIL_CHESTPLATE));

3
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/Spleef.java
View File

@ -172,6 +172,9 @@ public class Spleef extends SoloGame
event.setCancelled(true);
if (event.getBlock().getType() == Material.BEDROCK)
return;
BlockFade(event.getBlock(), event.getPlayer(), false);
//Snowball

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitSnowballer.java
View File

@ -21,7 +21,7 @@ public class KitSnowballer extends Kit
new String[]
{
"Throw snowballs to break blocks!",
"Receives 2 Snowball when you punch blocks!"
"Receives 1 Snowball when you punch blocks!"
},
new Perk[]

63
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/TurfForts.java
View File

@ -4,33 +4,6 @@ import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.HashMap;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
import net.minecraft.server.v1_7_R4.EntityArrow;
import net.minecraft.server.v1_7_R4.Item;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.MapUtil;
@ -57,6 +30,32 @@ import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.stats.BehindEnemyLinesStatTracker;
import nautilus.game.arcade.stats.BlockShreadStatTracker;
import nautilus.game.arcade.stats.TheComebackStatTracker;
import net.minecraft.server.v1_7_R4.EntityArrow;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Effect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftArrow;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.HandlerList;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockEvent;
import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.EntityShootBowEvent;
import org.bukkit.event.entity.ItemSpawnEvent;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
public class TurfForts extends TeamGame
{
@ -329,6 +328,16 @@ public class TurfForts extends TeamGame
}
@EventHandler(priority = EventPriority.HIGH)
public void BlockBreak(BlockBreakEvent event)
{
if (!IsAlive(event.getPlayer()))
{
event.setCancelled(true);
return;
}
}
@EventHandler
public void BlockDamage(ProjectileHitEvent event)
{

46
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/wither/WitherGame.java
View File

@ -6,24 +6,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.EntityEffect;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.ThrownPotion;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
@ -43,14 +25,32 @@ import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.TeamGame;
import nautilus.game.arcade.game.GameTeam.PlayerState;
import nautilus.game.arcade.game.TeamGame;
import nautilus.game.arcade.game.games.paintball.PlayerCopy;
import nautilus.game.arcade.game.games.wither.kit.*;
import nautilus.game.arcade.game.games.wither.kit.KitHumanArcher;
import nautilus.game.arcade.game.games.wither.kit.KitWitherMinion;
import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.kit.NullKit;
import nautilus.game.arcade.kit.perks.data.IBlockRestorer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.EntityEffect;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.entity.ThrownPotion;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.EntityCombustEvent;
import org.bukkit.event.entity.ProjectileHitEvent;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.util.Vector;
public class WitherGame extends TeamGame implements IBlockRestorer
{
private GameTeam _runners;
@ -111,12 +111,6 @@ public class WitherGame extends TeamGame implements IBlockRestorer
this.TeamArmor = true;
this.TeamArmorHotbar = false;
_help = new String[]
{
C.cRed + C.Bold + "This game is still under development!",
};
}
@Override

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
View File

@ -220,8 +220,8 @@ public abstract class Kit implements Listener
return _achivementCategory;
}
public boolean isYoutuber(Player player)
public boolean hasKitsUnlocked(Player player)
{
return Manager.isYoutuber(player);
return Manager.hasKitsUnlocked(player);
}
}

12
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkArcticAura.java
View File

@ -2,16 +2,17 @@ package nautilus.game.arcade.kit.perks;
import java.util.HashMap;
import org.bukkit.block.Block;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilMath;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
public class PerkArcticAura extends Perk
{
public PerkArcticAura()
@ -33,6 +34,9 @@ public class PerkArcticAura extends Perk
if (!Kit.HasKit(player))
continue;
if (((CraftPlayer) player).getHandle().spectating)
continue;
double range = 5*player.getExp();
//Blocks

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDestructor.java
View File

@ -90,7 +90,7 @@ public class PerkDestructor extends Perk
if (event.isCancelled())
return;
if (!UtilInv.IsItem(event.getItemDrop().getItemStack(), Material.ENDER_PEARL, (byte) 0))
if (!UtilInv.IsItem(event.getItemDrop().getItemStack(), "Seismic Charge", Material.ENDER_PEARL, (byte) 0))
return;
//Cancel

46
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkSeismicSlam.java
View File

@ -2,6 +2,19 @@ package nautilus.game.arcade.kit.perks;
import java.util.HashMap;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.kit.Perk;
import org.bukkit.Effect;
import org.bukkit.Sound;
import org.bukkit.block.Block;
@ -11,23 +24,10 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.block.Action;
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.entity.PlayerDeathEvent;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.util.Vector;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.kit.Perk;
public class PerkSeismicSlam extends Perk
{
private HashMap<LivingEntity, Long> _live = new HashMap<LivingEntity, Long>();
@ -40,6 +40,21 @@ public class PerkSeismicSlam extends Perk
});
}
@EventHandler
public void deactivateDeath(PlayerDeathEvent event)
{
if (!Manager.GetGame().IsLive())
return;
if (!Kit.HasKit(event.getEntity()))
return;
if (_live.containsKey(event.getEntity()))
{
_live.remove(event.getEntity());
}
}
@EventHandler
public void Leap(PlayerInteractEvent event)
{
@ -109,6 +124,9 @@ public class PerkSeismicSlam extends Perk
if (cur.equals(player))
continue;
if (cur instanceof Player && !Manager.IsAlive((Player) cur))
continue;
//Damage Event
Manager.GetDamage().NewDamageEvent(cur, player, null,
DamageCause.CUSTOM, damage * targets.get(cur) + 0.5, true, true, false,

Some files were not shown because too many files have changed in this diff Show More