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

Merge branch 'SSM2PlayerTeams' of http://184.154.0.242:7990/scm/min/mineplex into SSM2PlayerTeams

Browse Source
This commit is contained in:
Sarah 2015-07-30 02:33:51 +02:00
commit bf75594853
165 changed files with 5008 additions and 540 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
View File

@ -18,6 +18,8 @@
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
<element id="module-output" name="Mineplex.Database" /> <element id="module-output" name="Mineplex.Database" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" /> <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/org-apache-commons-lang.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
</root> </root>
</artifact> </artifact>
</component> </component>

1
Plugins/.idea/codeStyleSettings.xml
View File

@ -37,6 +37,7 @@
</codeStyleSettings> </codeStyleSettings>
</value> </value>
</option> </option>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" /> <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
</component> </component>
</project> </project>

28
Plugins/.idea/compiler.xml
View File

@ -21,8 +21,34 @@
<profile default="true" name="Default" enabled="false"> <profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" /> <processorPath useClasspath="true" />
</profile> </profile>
<profile default="false" name="Annotation profile for hub" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
<module name="hub" />
</profile>
<profile default="false" name="Annotation profile for gameplay" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
<module name="gameplay" />
</profile>
<profile default="false" name="Annotation profile for common" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="true" />
<module name="common" />
</profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel target="1.7" /> <bytecodeTargetLevel target="1.7">
<module name="common" target="1.7" />
<module name="gameplay" target="1.7" />
<module name="hub" target="1.7" />
<module name="parent" target="1.7" />
</bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">
<option name="GENERATE_NO_WARNINGS" value="true" /> <option name="GENERATE_NO_WARNINGS" value="true" />

10
Plugins/.idea/encodings.xml
View File

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" /> <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
</project> <file url="file://$PROJECT_DIR$/ParkerFactions" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ParkerFactions/common" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ParkerFactions/gameplay" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ParkerFactions/hub" charset="UTF-8" />
</component>
</project>

7
Plugins/.idea/misc.xml
View File

@ -7,6 +7,13 @@
</list> </list>
</component> </component>
<component name="IdProvider" IDEtalkID="7E81636CD93857493DFE224533ECF492" /> <component name="IdProvider" IDEtalkID="7E81636CD93857493DFE224533ECF492" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/ParkerFactions/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>

4
Plugins/.idea/modules.xml
View File

@ -18,6 +18,10 @@
<module fileurl="file://$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" filepath="$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" group="Core" /> <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" filepath="$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" group="Core" />
<module fileurl="file://$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" filepath="$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" group="Core" /> <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" filepath="$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" group="Core" />
<module fileurl="file://$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" filepath="$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" group="Game" /> <module fileurl="file://$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" filepath="$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" group="Game" />
<module fileurl="file://$PROJECT_DIR$/ParkerFactions/common/common.iml" filepath="$PROJECT_DIR$/ParkerFactions/common/common.iml" />
<module fileurl="file://$PROJECT_DIR$/ParkerFactions/gameplay/gameplay.iml" filepath="$PROJECT_DIR$/ParkerFactions/gameplay/gameplay.iml" />
<module fileurl="file://$PROJECT_DIR$/ParkerFactions/hub/hub.iml" filepath="$PROJECT_DIR$/ParkerFactions/hub/hub.iml" />
<module fileurl="file://$PROJECT_DIR$/ParkerFactions/parent.iml" filepath="$PROJECT_DIR$/ParkerFactions/parent.iml" />
</modules> </modules>
</component> </component>
</project> </project>

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>(); 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(" §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(" §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); 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"); System.out.println("Updated Bungee MOTD");

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

@ -1,20 +1,20 @@
package mineplex.core.common; package mineplex.core.common;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilPlayer;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilPlayer;
public enum Rank public enum Rank
{ {
LT("LT", ChatColor.DARK_RED), LT("LT", ChatColor.DARK_RED),
OWNER("Owner", ChatColor.DARK_RED), OWNER("Owner", ChatColor.DARK_RED),
DEVELOPER("Dev", ChatColor.RED), DEVELOPER("Dev", ChatColor.RED),
ADMIN("Admin", ChatColor.RED), ADMIN("Admin", ChatColor.RED),
JNR_DEV("Jr.Dev", ChatColor.RED),
SNR_MODERATOR("Sr.Mod", ChatColor.GOLD), SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
MODERATOR("Mod", ChatColor.GOLD), MODERATOR("Mod", ChatColor.GOLD),
JNR_DEV("Jr.Dev", ChatColor.RED),
HELPER("Trainee", ChatColor.DARK_AQUA), HELPER("Trainee", ChatColor.DARK_AQUA),
MAPLEAD("MapLead", ChatColor.DARK_PURPLE), MAPLEAD("MapLead", ChatColor.DARK_PURPLE),
MAPDEV("Builder", ChatColor.BLUE), MAPDEV("Builder", ChatColor.BLUE),
@ -75,7 +75,7 @@ public enum Rank
{ {
UtilPlayer.message(player, C.mHead + "Permissions> " + UtilPlayer.message(player, C.mHead + "Permissions> " +
C.mBody + "This requires Permission Rank [" + C.mBody + "This requires Permission Rank [" +
C.mHead + rank + C.mHead + rank.Name.toUpperCase() +
C.mBody + "]."); C.mBody + "].");
} }

7
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilText.java
View File

@ -48,6 +48,11 @@ public class UtilText {
public static boolean isStringSimilar(String newString, String oldString, float matchRequirement) public static boolean isStringSimilar(String newString, String oldString, float matchRequirement)
{ {
if (newString.length() <= 3)
{
return newString.toLowerCase().equals(oldString.toLowerCase());
}
for (int i=0 ; i < newString.length() * matchRequirement ; i++) for (int i=0 ; i < newString.length() * matchRequirement ; i++)
{ {
int matchFromIndex = 0; int matchFromIndex = 0;
@ -56,7 +61,7 @@ public class UtilText {
for (int j=0 ; j < oldString.length() ; j++) for (int j=0 ; j < oldString.length() ; j++)
{ {
//End of newString //End of newString
if (i+j > newString.length()) if (i+j >= newString.length())
{ {
break; break;
} }

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); 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() public CoreClientManager getClientManager()
{ {

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

@ -7,7 +7,7 @@ public interface ILoginProcessor
{ {
String getName(); 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); String getQuery(int accountId, String uuid, String name);
} }

14
Plugins/Mineplex.Core/src/mineplex/core/account/command/UpdateRank.java
View File

@ -19,12 +19,20 @@ public class UpdateRank extends CommandBase<CoreClientManager>
{ {
public UpdateRank(CoreClientManager plugin) public UpdateRank(CoreClientManager plugin)
{ {
super(plugin, Rank.ADMIN, "updateRank"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV /*On test servers only*/}, "updateRank");
} }
@Override @Override
public void Execute(final Player caller, String[] args) public void Execute(final Player caller, String[] args)
{ {
boolean testServer = Plugin.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
if (Plugin.Get(caller).GetRank() == Rank.JNR_DEV && !testServer)
{
F.main(Plugin.getName(), F.elem(Rank.JNR_DEV.GetTag(true, true)) + "s are only permitted to set ranks on test servers!");
return;
}
if (args == null) if (args == null)
{ {
UtilPlayer.message(caller, F.main(Plugin.getName(), "/" + AliasUsed + " joeschmo MODERATOR")); UtilPlayer.message(caller, F.main(Plugin.getName(), "/" + AliasUsed + " joeschmo MODERATOR"));
@ -52,9 +60,9 @@ public class UpdateRank extends CommandBase<CoreClientManager>
final Rank rank = tempRank; final Rank rank = tempRank;
if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR) if (rank == Rank.ADMIN || rank == Rank.YOUTUBE || rank == Rank.TWITCH || rank == Rank.MODERATOR || rank == Rank.HELPER || rank == Rank.ALL || rank == Rank.MAPDEV || rank == Rank.SNR_MODERATOR || rank == Rank.JNR_DEV || rank == Rank.DEVELOPER)
{ {
if (rank == Rank.ADMIN && !Plugin.hasRank(caller, Rank.LT)) if (!testServer && rank.Has(Rank.ADMIN) && !Plugin.hasRank(caller, Rank.LT))
{ {
UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Insufficient privileges!")); UtilPlayer.message(caller, F.main(Plugin.getName(), ChatColor.RED + "" + ChatColor.BOLD + "Insufficient privileges!"));
return; return;

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()) for (ILoginProcessor loginProcessor : loginProcessors.values())
{ {
loginProcessor.processLoginResultSet(name, statement.getResultSet()); loginProcessor.processLoginResultSet(name, accountId, statement.getResultSet());
statement.getMoreResults(); statement.getMoreResults();
} }
} }

42
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, SUPER_PAINTBALL_FLAWLESS_VICTORY("Flawless Victory", 1000,
new String[]{"Super Paintball.Wins"}, 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}, new int[]{1},
AchievementCategory.SUPER_PAINTBALL), AchievementCategory.SUPER_PAINTBALL),
@ -630,6 +630,44 @@ public enum Achievement
new String[]{"Kill 2 enemies while blinded from", "a single flashbang"}, new String[]{"Kill 2 enemies while blinded from", "a single flashbang"},
new int[]{1}, new int[]{1},
AchievementCategory.MINE_STRIKE), 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_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", 1200,
new String[]{"Bomb Lobbers.JellySkin"},
new String[]{"Win a game without taking any damage."},
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_SNIPER("Sniper", 10000,
new String[]{"Bomb Lobbers.Direct Hit"},
new String[]{"Get 50 direct hits"},
new int[]{50},
AchievementCategory.BOMB_LOBBERS)
; ;
private String _name; private String _name;
@ -754,7 +792,7 @@ public enum Achievement
return _category; return _category;
} }
public AchievementData getLevelData(int exp) public AchievementData getLevelData(long exp)
{ {
for (int i = 0; i < _levels.length; i++) for (int i = 0; i < _levels.length; i++)
{ {

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

@ -16,7 +16,7 @@ public enum AchievementCategory
{ {
GLOBAL("Global", null, GLOBAL("Global", null,
new StatDisplay[] { StatDisplay.GEMS_EARNED, null, new StatDisplay("Games Played", "GamesPlayed"), StatDisplay.TIME_IN_GAME }, 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, BRIDGES("The Bridges", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, UHC("Ultra Hardcore", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, WIZARDS("Wizards", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, CASTLE_SIEGE("Castle Siege", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, new StatDisplay("Kills as Defenders"), new StatDisplay("Deaths as Defenders"), 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, BLOCK_HUNT("Block Hunt", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, SMASH_MOBS("Super Smash Mobs", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, MINE_STRIKE("MineStrike", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, DRAW_MY_THING("Draw My Thing", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED }, 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"}, CHAMPIONS("Champions", new String[] {"Champions Domination", "Champions TDM"},
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, MASTER_BUILDERS("Master Builders", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED }, new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED },
Material.WOOD, 0, GameCategory.CLASSICS, null), Material.WOOD, 0, GameCategory.CLASSICS, "None"),
//Arcade //Arcade
DRAGONS("Dragons", null, DRAGONS("Dragons", null,
@ -74,7 +74,7 @@ public enum AchievementCategory
DRAGON_ESCAPE("Dragon Escape", null, DRAGON_ESCAPE("Dragon Escape", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.GEMS_EARNED }, 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, SHEEP_QUEST("Sheep Quest", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, SNEAKY_ASSASSINS("Sneaky Assassins", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, ONE_IN_THE_QUIVER("One in the Quiver", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, SUPER_PAINTBALL("Super Paintball", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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), Material.HARD_CLAY, 14, GameCategory.ARCADE, null),
RUNNER("Runner", 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), Material.LEATHER_BOOTS, 0, GameCategory.ARCADE, null),
SPLEEF("Super Spleef", 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), Material.IRON_SPADE, 0, GameCategory.ARCADE, null),
DEATH_TAG("Death Tag", null, DEATH_TAG("Death Tag", null,
@ -110,7 +110,7 @@ public enum AchievementCategory
SNAKE("Snake", null, SNAKE("Snake", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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, BACON_BRAWL("Bacon Brawl", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
@ -118,9 +118,12 @@ public enum AchievementCategory
MICRO_BATTLE("Micro Battle", null, MICRO_BATTLE("Micro Battle", null,
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, 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 _name;
private String[] _statsToPull; private String[] _statsToPull;
private StatDisplay[] _statDisplays; private StatDisplay[] _statDisplays;

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

@ -3,10 +3,10 @@ package mineplex.core.achievement;
public class AchievementData public class AchievementData
{ {
private int _level; private int _level;
private int _expRemainder; private long _expRemainder;
private int _expNextLevel; private long _expNextLevel;
public AchievementData(int level, int expRemainder, int expNextLevel) public AchievementData(int level, long expRemainder, long expNextLevel)
{ {
_level = level; _level = level;
_expRemainder = expRemainder; _expRemainder = expRemainder;
@ -18,12 +18,12 @@ public class AchievementData
return _level; return _level;
} }
public int getExpRemainder() public long getExpRemainder()
{ {
return _expRemainder; return _expRemainder;
} }
public int getExpNextLevel() public long getExpNextLevel()
{ {
return _expNextLevel; 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 class AchievementLog
{ {
public int Amount; public long Amount;
public boolean LevelUp; public boolean LevelUp;
public AchievementLog(int amount, boolean levelUp) public AchievementLog(long amount, boolean levelUp)
{ {
Amount = amount; Amount = amount;
LevelUp = levelUp; LevelUp = levelUp;

24
Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementManager.java
View File

@ -208,18 +208,22 @@ public class AchievementManager extends MiniPlugin
{ {
int level = get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel(); int level = get(sender, Achievement.GLOBAL_MINEPLEX_LEVEL).getLevel();
if (sender.getName().equalsIgnoreCase("B2_mp"))
return 101;
if (rank.Has(Rank.MODERATOR))
level = Math.max(level, 5);
if (rank.Has(Rank.SNR_MODERATOR))
level = Math.max(level, 15);
if (rank.Has(Rank.JNR_DEV))
level = Math.max(level, 25);
if (rank.Has(Rank.ADMIN))
level = Math.max(level, 30 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
if (rank.Has(Rank.OWNER))
level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
if (sender.getName().equalsIgnoreCase("Phinary")) if (sender.getName().equalsIgnoreCase("Phinary"))
level = -level; level = -level;
else if (sender.getName().equalsIgnoreCase("B2_mp"))
return 101;
else if (rank.Has(Rank.OWNER))
level = Math.max(level, 50 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
else if (rank.Has(Rank.ADMIN))
level = Math.max(level, 30 + get(sender, Achievement.GLOBAL_GEM_HUNTER).getLevel());
else if (rank.Has(Rank.SNR_MODERATOR))
level = Math.max(level, 15);
else if (rank.Has(Rank.MODERATOR))
level = Math.max(level, 5);
return level; return level;
} }

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

@ -345,7 +345,7 @@ public class AntiHack extends MiniPlugin
} }
//Auto-Kick //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); 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 @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)); 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", UtilPlayer.message(sender, F.main("Chat",
"Accusing players of cheating in-game is against the rules." "Accusing players of cheating in-game is against the rules."
+ "If you think someone is cheating, please gather evidence and report it at " + "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); event.setCancelled(true);
} }
else if (_playerLastMessage.containsKey(sender.getUniqueId())) else if (_playerLastMessage.containsKey(sender.getUniqueId()))

8
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
View File

@ -17,6 +17,7 @@ import mineplex.core.cosmetic.ui.button.ActivateGadgetButton;
import mineplex.core.cosmetic.ui.button.DeactivateGadgetButton; import mineplex.core.cosmetic.ui.button.DeactivateGadgetButton;
import mineplex.core.cosmetic.ui.button.GadgetButton; import mineplex.core.cosmetic.ui.button.GadgetButton;
import mineplex.core.donation.DonationManager; import mineplex.core.donation.DonationManager;
import mineplex.core.gadget.gadgets.MorphBlock;
import mineplex.core.gadget.gadgets.MorphNotch; import mineplex.core.gadget.gadgets.MorphNotch;
import mineplex.core.gadget.types.Gadget; import mineplex.core.gadget.types.Gadget;
import mineplex.core.gadget.types.GadgetType; import mineplex.core.gadget.types.GadgetType;
@ -68,6 +69,13 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
//setItem(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Disabled " + gadget.GetName(), new String[] { "Sorry! Currently disabled until fix is made for 1.8 players!" }, 1, false, false)); //setItem(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), "Disabled " + gadget.GetName(), new String[] { "Sorry! Currently disabled until fix is made for 1.8 players!" }, 1, false, false));
//return; //return;
} }
else if (gadget instanceof MorphBlock)
{
//Prevent stacker bug
if (getPlayer().getPassenger() != null)
return;
}
List<String> itemLore = new ArrayList<String>(); List<String> itemLore = new ArrayList<String>();
if (gadget.GetCost(CurrencyType.Coins) >= 0) if (gadget.GetCost(CurrencyType.Coins) >= 0)

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 + C.cPurple + "Hero Rank",
ChatColor.RESET + "Receives 15000 Coins per Month", ChatColor.RESET + "Receives 15000 Coins per Month",
" ",
ChatColor.RESET + C.cGreen + "Legend Rank",
ChatColor.RESET + "Recieves 30000 Coins per Month"
}, 1, false)); }, 1, false));
addButton(18, new ShopItem(Material.NETHER_STAR, "Particle Effects", 1, false), new OpenParticles(this)); 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 @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()); 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 @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)); 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 @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)); 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.ArrayList;
import java.util.List; import java.util.List;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.MapUtil; import mineplex.core.common.util.MapUtil;
import mineplex.core.common.util.UtilBlock; import mineplex.core.common.util.UtilBlock;
@ -64,6 +63,7 @@ public class BlockForm
DisguiseChicken disguise = new DisguiseChicken(_player); DisguiseChicken disguise = new DisguiseChicken(_player);
disguise.setBaby(); disguise.setBaby();
disguise.setSoundDisguise(new DisguiseCat(_player)); disguise.setSoundDisguise(new DisguiseCat(_player));
disguise.setInvisible(true);
_host.Manager.getDisguiseManager().disguise(disguise); _host.Manager.getDisguiseManager().disguise(disguise);
//Apply Falling Block //Apply Falling Block

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

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

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), HideSeek("Block Hunt", Material.GRASS, (byte)0, GameCategory.CLASSICS, 20),
HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52), HoleInTheWall("Hole in the Wall", Material.STAINED_GLASS, (byte) 2, GameCategory.ARCADE, 52),
Horse("Horseback", Material.IRON_BARDING, (byte)0, GameCategory.ARCADE, 21), 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), Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24),
MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27), 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 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), Build("Master Builders", Material.WOOD, (byte)0, GameCategory.CLASSICS, 50),
Cards("Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51), 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),
SkywarsTeams("Skywars Teams", Material.FEATHER, (byte)5, GameCategory.TEAM_VARIANT, 53), SkywarsTeams("Skywars Teams", Material.FEATHER, (byte)5, GameCategory.TEAM_VARIANT, 53),
Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999); 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 @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)); 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 @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)); Set(playerName, _repository.loadClientInformation(resultSet));
} }

2
Plugins/Mineplex.Core/src/mineplex/core/npc/command/HomeCommand.java
View File

@ -12,7 +12,7 @@ public class HomeCommand extends CommandBase<NpcManager>
{ {
public HomeCommand(NpcManager plugin) public HomeCommand(NpcManager plugin)
{ {
super(plugin, Rank.DEVELOPER, "home"); super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "home");
} }
@Override @Override

2
Plugins/Mineplex.Core/src/mineplex/core/npc/command/NpcCommand.java
View File

@ -10,7 +10,7 @@ public class NpcCommand extends MultiCommandBase<NpcManager>
{ {
public NpcCommand(NpcManager plugin) public NpcCommand(NpcManager plugin)
{ {
super(plugin, Rank.DEVELOPER, "npc"); super(plugin, Rank.DEVELOPER, new Rank[] {Rank.JNR_DEV}, "npc");
AddCommand(new AddCommand(plugin)); AddCommand(new AddCommand(plugin));
AddCommand(new DeleteCommand(plugin)); AddCommand(new DeleteCommand(plugin));

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(); 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; ram = 2048;
cpu = 4; cpu = 4;

2
Plugins/Mineplex.Core/src/mineplex/core/portal/Commands/SendCommand.java
View File

@ -14,7 +14,7 @@ public class SendCommand extends CommandBase<Portal>
{ {
public SendCommand(Portal plugin) public SendCommand(Portal plugin)
{ {
super(plugin, Rank.ADMIN, "send"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "send");
} }
@Override @Override

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

@ -106,7 +106,7 @@ public class PreferencesManager extends MiniDbClientPlugin<UserPreferences>
} }
@Override @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)); Set(playerName, _repository.loadClientInformation(resultSet));
} }

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

@ -255,13 +255,13 @@ public class PreferencesPage extends ShopPageBase<PreferencesManager, Preference
buildPreference(40, Material.RED_ROSE, "Show Pending Friend Requests", userPreferences.PendingFriendRequests, _togglePendingFriendRequests); 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(38, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
buildPreference(42, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield); buildPreference(42, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield);
buildPreference(44, Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity); buildPreference(44, Material.SADDLE, "Hub Ignore Velocity", userPreferences.IgnoreVelocity, _toggleHubIgnoreVelocity);
} }
if (getClientManager().Get(getPlayer()).GetRank().Has(Rank.ADMIN)) if (getClientManager().Get(getPlayer()).GetRank().Has(Rank.ADMIN) || getClientManager().Get(getPlayer()).GetRank() == Rank.JNR_DEV)
{ {
buildPreference(36, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility); buildPreference(36, Material.NETHER_STAR, "Hub Invisibility", userPreferences.Invisibility, _toggleHubInvisibility);
buildPreference(38, Material.SLIME_BALL, "Hub Forcefield", userPreferences.HubForcefield, _toggleHubForcefield); buildPreference(38, 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; package mineplex.core.projectile;
import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.WeakHashMap; import java.util.WeakHashMap;
import mineplex.core.MiniPlugin; import mineplex.core.MiniPlugin;
import mineplex.core.common.util.UtilParticle.ParticleType; 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.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import org.bukkit.Effect; import org.bukkit.Effect;
import org.bukkit.Sound; import org.bukkit.Sound;
@ -35,7 +33,7 @@ public class ProjectileManager extends MiniPlugin
{ {
_thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback, _thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false, 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, 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, _thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, pickup, 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, 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, _thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false, 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, 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, _thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false, 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, 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, _thrown.put(thrown, new ProjectileUser(this, thrown, thrower, callback,
expireTime, hitPlayer, hitBlock, idle, false, 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 @EventHandler

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

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

41
Plugins/Mineplex.Core/src/mineplex/core/punish/UI/PunishPage.java
View File

@ -7,6 +7,19 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.inventory.ItemStack;
import mineplex.core.antihack.AntiHack; import mineplex.core.antihack.AntiHack;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
@ -23,18 +36,6 @@ import mineplex.core.punish.PunishmentSorter;
import mineplex.core.shop.item.IButton; import mineplex.core.shop.item.IButton;
import mineplex.core.shop.item.ShopItem; import mineplex.core.shop.item.ShopItem;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftInventoryCustom;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.inventory.ItemStack;
public class PunishPage extends CraftInventoryCustom implements Listener public class PunishPage extends CraftInventoryCustom implements Listener
{ {
private Punish _plugin; private Punish _plugin;
@ -232,14 +233,12 @@ public class PunishPage extends CraftInventoryCustom implements Listener
examplePrefixEx + " Forcefield", examplePrefixEx + " Forcefield",
examplePrefixEx + " Speed Hack", examplePrefixEx + " Speed Hack",
examplePrefixEx + " Reach Hack", examplePrefixEx + " Reach Hack",
examplePrefixEx + " Speed Hack",
examplePrefixEx + " Other Hack", examplePrefixEx + " Other Hack",
" ", " ",
examplePrefix + "Hack Reports (SR & FR);", examplePrefix + "Hack Reports (SR & FR);",
examplePrefixEx + " Forcefield", examplePrefixEx + " Forcefield",
examplePrefixEx + " Speed Hack", examplePrefixEx + " Speed Hack",
examplePrefixEx + " Reach Hack", examplePrefixEx + " Reach Hack",
examplePrefixEx + " Speed Hack",
examplePrefixEx + " Other Hack", examplePrefixEx + " Other Hack",
examplePrefixEx + " Fly Hack", examplePrefixEx + " Fly Hack",
} }
@ -294,6 +293,20 @@ public class PunishPage extends CraftInventoryCustom implements Listener
}, 1, false, true), new PunishButton(this, Category.ChatOffense, 4, false, -1)); }, 1, false, true), new PunishButton(this, Category.ChatOffense, 4, false, -1));
} }
if (_plugin.GetClients().Get(_player).GetRank() == Rank.DEVELOPER || _plugin.GetClients().Get(_player).GetRank() == Rank.JNR_DEV)
{
ShopItem devWarning = new ShopItem(Material.YELLOW_FLOWER, "DEV WARNING", new String[] {ChatColor.RESET + "Developers are advised against using the punish system", ChatColor.RESET + "unless permitted by LT"}, 1, true, true);
devWarning.addGlow();
AddButton(0, devWarning, new IButton()
{
@Override
public void onClick(Player player, ClickType clickType)
{
}
});
}
Collections.sort(punishments, new PunishmentSorter()); Collections.sort(punishments, new PunishmentSorter());
int slot = 45; int slot = 45;

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 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)) if (!_statHash.containsKey(statName))
{ {
_statHash.put(statName, 0); _statHash.put(statName, 0L);
} }
_statHash.put(statName, _statHash.get(statName) + value); _statHash.put(statName, _statHash.get(statName) + value);
@ -20,9 +20,9 @@ public class PlayerStats
return _statHash.get(statName); 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() public Set<String> getStatsNames()

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

@ -0,0 +1,183 @@
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<>();
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, Math.max(oldPlayerStats.getStat(statName), 0L));
inserts.add(insert);
}
context.transaction(new TransactionalRunnable()
{
@Override
public void run(Configuration config) throws Exception
{
DSL.using(config).batch(inserts).execute();
}
});
}
catch (Exception e)
{
e.printStackTrace();
}
}
else
{
_statsManager.replacePlayerHack(playerName, newPlayerStats);
if (oldPlayerStats.getStatsNames().size() != 0)
{
try
{
final DSLContext context = DSL.using(DBPool.ACCOUNT, SQLDialect.MYSQL);
final List<Update> updates = new ArrayList<>();
final List<Insert> inserts = new ArrayList<>();
boolean foundNegativeStat = false;
boolean foundLessThanStat = false;
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, Math.max(oldPlayerStats.getStat(statName), 0L));
inserts.add(insert);
Update update = context
.update(Tables.accountStat)
.set(Tables.accountStat.value, Math.max(oldPlayerStats.getStat(statName), 0L))
.where(Tables.accountStat.accountId.eq(accountId))
.and(Tables.accountStat.statId.eq(statId));
updates.add(update);
if (oldPlayerStats.getStat(statName) < 0)
{
foundNegativeStat = true;
}
else if (newPlayerStats.getStat(statName) < oldPlayerStats.getStat(statName))
{
foundLessThanStat = true;
}
}
if (foundNegativeStat && foundLessThanStat)
{
context.transaction(new TransactionalRunnable()
{
@Override
public void run(Configuration config) throws Exception
{
int[] updateResult = context.batch(updates).execute();
for (int i = 0; i < updateResult.length; i++)
{
if (updateResult[i] > 0)
inserts.set(i, null);
}
inserts.removeAll(Collections.singleton(null));
context.batch(inserts).execute();
System.out.println("Updating");
}
});
}
/*
final List<Delete> deletes = new ArrayList<>();
for (String statName : oldPlayerStats.getStatsNames())
{
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(deletes).execute();
}
});
*/
}
catch (Exception e)
{
e.printStackTrace();
}
}
}
}
@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 org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.MiniDbClientPlugin; import mineplex.core.MiniDbClientPlugin;
import mineplex.core.account.CoreClient;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
import mineplex.core.common.util.NautHashMap; import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilServer; import mineplex.core.common.util.UtilServer;
@ -24,7 +23,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
private StatsRepository _repository; private StatsRepository _repository;
private NautHashMap<String, Integer> _stats = new NautHashMap<String, Integer>(); 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; private Runnable _saveRunnable;
public StatsManager(JavaPlugin plugin, CoreClientManager clientManager) public StatsManager(JavaPlugin plugin, CoreClientManager clientManager)
@ -50,11 +49,13 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
{ {
_stats.put(stat.Name, stat.Id); _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 //Event
UtilServer.getServer().getPluginManager().callEvent(new StatChangeEvent(player.getName(), statName, newValue - value, newValue)); 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) synchronized (_statSync)
{ {
if (!_statUploadQueue.containsKey(player)) if (!_statUploadQueue.containsKey(player))
_statUploadQueue.put(player, new NautHashMap<String, Integer>()); _statUploadQueue.put(player, new NautHashMap<String, Long>());
if (!_statUploadQueue.get(player).containsKey(statName)) 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); _statUploadQueue.get(player).put(statName, _statUploadQueue.get(player).get(statName) + value);
} }
@ -118,7 +119,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
try 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) synchronized (_statSync)
{ {
@ -131,7 +132,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
int uploadKey = ClientManager.getCachedClientAccountId(player.getUniqueId()); 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()) 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)) if (_stats.containsKey(statName))
return false; return false;
final NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Integer>>(); final NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue = new NautHashMap<Integer, NautHashMap<Integer, Long>>();
uploadQueue.put(accountId, new NautHashMap<Integer, Integer>()); uploadQueue.put(accountId, new NautHashMap<Integer, Long>());
uploadQueue.get(accountId).put(_stats.get(statName), value); uploadQueue.get(accountId).put(_stats.get(statName), value);
runAsync(new Runnable() runAsync(new Runnable()
@ -172,6 +173,16 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
return true; return true;
} }
public int getStatId(String statName)
{
return _stats.get(statName);
}
public void replacePlayerHack(String playerName, PlayerStats playerStats)
{
Set(playerName, playerStats);
}
@Override @Override
protected PlayerStats AddPlayer(String player) protected PlayerStats AddPlayer(String player)
{ {
@ -191,7 +202,7 @@ public class StatsManager extends MiniDbClientPlugin<PlayerStats>
} }
@Override @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)); 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") @SuppressWarnings("rawtypes")
public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Integer>> uploadQueue) public void saveStats(NautHashMap<Integer, NautHashMap<Integer, Long>> uploadQueue)
{ {
try try
{ {
@ -91,18 +91,18 @@ public class StatsRepository extends RepositoryBase
for (Integer statId : uploadQueue.get(accountId).keySet()) for (Integer statId : uploadQueue.get(accountId).keySet())
{ {
Update update = context Update update = context
.update(Tables.accountStats) .update(Tables.accountStat)
.set(Tables.accountStats.value, Tables.accountStats.value.plus(uploadQueue.get(accountId).get(statId))) .set(Tables.accountStat.value, Tables.accountStat.value.plus(uploadQueue.get(accountId).get(statId)))
.where(Tables.accountStats.accountId.eq(accountId)) .where(Tables.accountStat.accountId.eq(accountId))
.and(Tables.accountStats.statId.eq(statId)); .and(Tables.accountStat.statId.eq(statId));
updates.add(update); updates.add(update);
Insert insert = context Insert insert = context
.insertInto(Tables.accountStats) .insertInto(Tables.accountStat)
.set(Tables.accountStats.accountId, accountId) .set(Tables.accountStat.accountId, accountId)
.set(Tables.accountStats.statId, statId) .set(Tables.accountStat.statId, statId)
.set(Tables.accountStats.value, uploadQueue.get(accountId).get(statId)); .set(Tables.accountStat.value, uploadQueue.get(accountId).get(statId));
inserts.add(insert); inserts.add(insert);
} }
@ -137,10 +137,10 @@ public class StatsRepository extends RepositoryBase
context = DSL.using(getConnectionPool(), SQLDialect.MYSQL); 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) .join(Tables.stats)
.on(Tables.stats.id.eq(Tables.accountStats.statId)) .on(Tables.stats.id.eq(Tables.accountStat.statId))
.where(Tables.accountStats.accountId.eq(DSL.select(Tables.accounts.id) .where(Tables.accountStat.accountId.eq(DSL.select(Tables.accounts.id)
.from(Tables.accounts) .from(Tables.accounts)
.where(Tables.accounts.name.eq(playerName))) .where(Tables.accounts.name.eq(playerName)))
).fetch(); ).fetch();
@ -149,7 +149,7 @@ public class StatsRepository extends RepositoryBase
if (result.isNotEmpty()) if (result.isNotEmpty())
{ {
playerStats = new PlayerStats(); playerStats = new PlayerStats();
for (Record2<String, Integer> record : result) for (Record2<String, Long> record : result)
{ {
playerStats.addStat(record.value1(), record.value2()); 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]); final CoreClient client = Plugin.getClientManager().Get(args[0]);
if (client != null) 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 else
caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + args[0] + "'s account!")); caller.sendMessage(F.main(Plugin.getName(), "Couldn't find " + args[0] + "'s account!"));
} }

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

@ -55,7 +55,7 @@ public class TimeCommand extends CommandBase<StatsManager>
} }
else 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")); 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,8 +70,8 @@ public class TimeCommand extends CommandBase<StatsManager>
} }
else 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"))); 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 _player;
private String _statName; private String _statName;
private int _valueBefore; private long _valueBefore;
private int _valueAfter; 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; _player = player;
_statName = statName; _statName = statName;
@ -42,12 +42,12 @@ public class StatChangeEvent extends Event
return _statName; return _statName;
} }
public int getValueBefore() public long getValueBefore()
{ {
return _valueBefore; return _valueBefore;
} }
public int getValueAfter() public long getValueAfter()
{ {
return _valueAfter; 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 @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)); Set(playerName, _repository.loadClientInformation(resultSet));
} }

2
Plugins/Mineplex.Core/src/mineplex/core/teleport/command/HereCommand.java
View File

@ -10,7 +10,7 @@ public class HereCommand extends CommandBase<Teleport>
{ {
public HereCommand(Teleport plugin) public HereCommand(Teleport plugin)
{ {
super(plugin, Rank.ADMIN, "here", "h"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "here", "h");
} }
@Override @Override

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

@ -99,7 +99,10 @@ public class TreasureLocation implements Listener
setHoloChestVisible(false); 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())); Bukkit.broadcastMessage(F.main("Treasure", F.name(player.getName()) + " is opening a " + treasureType.getName()));
Reward[] rewards = _treasureManager.getRewards(player, treasureType.getRewardType()); Reward[] rewards = _treasureManager.getRewards(player, treasureType.getRewardType());
@ -324,6 +327,11 @@ public class TreasureLocation implements Listener
_hologram.start(); _hologram.start();
} }
public Treasure getCurrentTreasure()
{
return _currentTreasure;
}
public void openShop(Player player) public void openShop(Player player)
{ {
_shop.attemptShopOpen(player); _shop.attemptShopOpen(player);

16
Plugins/Mineplex.Core/src/mineplex/core/treasure/TreasureManager.java
View File

@ -125,6 +125,22 @@ public class TreasureManager extends MiniPlugin
return _rewardManager.getRewards(player, rewardType); return _rewardManager.getRewards(player, rewardType);
} }
public boolean isOpening(Player player)
{
for (TreasureLocation treasureLocation : _treasureLocations)
{
Treasure treasure = treasureLocation.getCurrentTreasure();
if (treasure == null)
continue;
if (treasure.getPlayer().equals(player))
return true;
}
return false;
}
public BlockRestore getBlockRestore() public BlockRestore getBlockRestore()
{ {
return _blockRestore; return _blockRestore;

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

@ -15,7 +15,7 @@ public class RestartServerCommand extends CommandBase<FileUpdater>
{ {
public RestartServerCommand(FileUpdater plugin) public RestartServerCommand(FileUpdater plugin)
{ {
super(plugin, Rank.ADMIN, "restart"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "restart");
} }
@Override @Override

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

@ -91,7 +91,7 @@ public class VisibilityManager extends MiniPlugin
_data.remove(event.getPlayer()); _data.remove(event.getPlayer());
} }
@EventHandler //@EventHandler DISABLED
public void updateDebug(UpdateEvent event) public void updateDebug(UpdateEvent event)
{ {
if (event.getType() != UpdateType.MIN_01) if (event.getType() != UpdateType.MIN_01)

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

@ -16,7 +16,7 @@ package mineplex.database;
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Account extends org.jooq.impl.SchemaImpl implements java.io.Serializable, java.lang.Cloneable { 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> * 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.AccountPolls.accountPolls,
mineplex.database.tables.AccountPreferences.accountPreferences, mineplex.database.tables.AccountPreferences.accountPreferences,
mineplex.database.tables.Accounts.accounts, mineplex.database.tables.Accounts.accounts,
mineplex.database.tables.AccountStat.accountStat,
mineplex.database.tables.AccountStats.accountStats, mineplex.database.tables.AccountStats.accountStats,
mineplex.database.tables.AccountTasks.accountTasks, mineplex.database.tables.AccountTasks.accountTasks,
mineplex.database.tables.AccountTransactions.accountTransactions, 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.ItemCategories.itemCategories,
mineplex.database.tables.Items.items, mineplex.database.tables.Items.items,
mineplex.database.tables.Mail.mail, mineplex.database.tables.Mail.mail,
mineplex.database.tables.Mailbox.mailbox,
mineplex.database.tables.Npcs.npcs, mineplex.database.tables.Npcs.npcs,
mineplex.database.tables.PlayerMap.playerMap, mineplex.database.tables.PlayerMap.playerMap,
mineplex.database.tables.Polls.polls, mineplex.database.tables.Polls.polls,
mineplex.database.tables.RankBenefits.rankBenefits,
mineplex.database.tables.ServerPassword.serverPassword, mineplex.database.tables.ServerPassword.serverPassword,
mineplex.database.tables.Spawns.spawns, mineplex.database.tables.Spawns.spawns,
mineplex.database.tables.StatEvents.statEvents, 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.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.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.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.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.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.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.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.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; 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.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_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.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.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.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; 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_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.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.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.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_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.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.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.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.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; 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.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.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.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.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.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; 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.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.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.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 // [#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.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.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.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.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.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.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.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.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); 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.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_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.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.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.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); 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_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.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.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.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_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.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.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.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.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); 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.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.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.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.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.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); 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.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.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.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" }) @java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" })
public class Routines { 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> * 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(); mineplex.database.routines.Check_daily p = new mineplex.database.routines.Check_daily();
p.setAccountId_in(accountId_in); p.setAccountId_in(accountId_in);
p.setCoins_change(coins_change); p.setCoinsChange(coinsChange);
p.setGems_change(gems_change); 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); p.execute(configuration);
return p; return p;
@ -117,6 +142,16 @@ public class Routines {
p.execute(configuration); 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> * 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; 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 * The table Account.accountStats
*/ */
@ -156,6 +161,11 @@ public class Tables {
*/ */
public static final mineplex.database.tables.Mail mail = mineplex.database.tables.Mail.mail; 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 * The table Account.npcs
*/ */
@ -171,6 +181,11 @@ public class Tables {
*/ */
public static final mineplex.database.tables.Polls polls = mineplex.database.tables.Polls.polls; 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 * 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" }) @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 { 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>. * 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); 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>. * 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); super("check_daily", mineplex.database.Account.Account);
addInParameter(accountId_in); addInParameter(accountId_in);
addInParameter(coins_change); addInParameter(coinsChange);
addInParameter(gems_change); addInParameter(gemsChange);
addOutParameter(pass); addOutParameter(pass);
addOutParameter(outTime); 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) { public void setCoinsChange(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_daily.coins_change, 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) { public void setGemsChange(java.lang.Integer value) {
setValue(mineplex.database.routines.Check_daily.gems_change, 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" }) @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 { 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> * 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>. * 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 * 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" }) @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 { 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> * 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, ""); 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 * 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" comments = "This class is generated by jOOQ"
) )
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) @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>. * 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>. * Setter for <code>Account.bonus.ranktime</code>.
*/ */
public void setRanktime(java.sql.Timestamp value) { public void setRanktime(java.sql.Date value) {
setValue(2, value); setValue(2, value);
} }
/** /**
* Getter for <code>Account.bonus.ranktime</code>. * Getter for <code>Account.bonus.ranktime</code>.
*/ */
public java.sql.Timestamp getRanktime() { public java.sql.Date getRanktime() {
return (java.sql.Timestamp) getValue(2); return (java.sql.Date) getValue(2);
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -80,7 +80,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @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(); return (org.jooq.Row3) super.fieldsRow();
} }
@ -88,7 +88,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @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(); return (org.jooq.Row3) super.valuesRow();
} }
@ -112,7 +112,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public org.jooq.Field<java.sql.Timestamp> field3() { public org.jooq.Field<java.sql.Date> field3() {
return mineplex.database.tables.Bonus.bonus.ranktime; return mineplex.database.tables.Bonus.bonus.ranktime;
} }
@ -136,7 +136,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public java.sql.Timestamp value3() { public java.sql.Date value3() {
return getRanktime(); return getRanktime();
} }
@ -162,7 +162,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @Override
public BonusRecord value3(java.sql.Timestamp value) { public BonusRecord value3(java.sql.Date value) {
setRanktime(value); setRanktime(value);
return this; return this;
} }
@ -171,7 +171,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @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; return this;
} }
@ -189,7 +189,7 @@ public class BonusRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
/** /**
* Create a detached, initialised BonusRecord * 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); super(mineplex.database.tables.Bonus.bonus);
setValue(0, accountId); 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" comments = "This class is generated by jOOQ"
) )
@java.lang.SuppressWarnings({ "all", "unchecked", "rawtypes" }) @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>. * 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); 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 // Primary key information
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
@ -157,23 +227,23 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
} }
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// Record9 type implementation // Record14 type implementation
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @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() { 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.Row9) super.fieldsRow(); return (org.jooq.Row14) super.fieldsRow();
} }
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @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() { 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.Row9) super.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; 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} * {@inheritDoc}
*/ */
@ -320,6 +430,46 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
return getEnergy(); 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} * {@inheritDoc}
*/ */
@ -405,7 +555,52 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
* {@inheritDoc} * {@inheritDoc}
*/ */
@Override @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; return this;
} }
@ -423,7 +618,7 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
/** /**
* Create a detached, initialised ClansRecord * 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); super(mineplex.database.tables.Clans.clans);
setValue(0, id); setValue(0, id);
@ -435,5 +630,10 @@ public class ClansRecord extends org.jooq.impl.UpdatableRecordImpl<mineplex.data
setValue(6, dateCreated); setValue(6, dateCreated);
setValue(7, lastOnline); setValue(7, lastOnline);
setValue(8, energy); 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);
}
}

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

@ -1,16 +1,13 @@
package mineplex.hub; package mineplex.hub;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Color;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.craftbukkit.v1_7_R4.CraftWorld; import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
import org.bukkit.entity.Egg; import org.bukkit.entity.Egg;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
@ -54,7 +51,6 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.F; import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction; import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilFirework;
import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilInv;
import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
@ -91,11 +87,11 @@ import mineplex.hub.commands.GadgetToggle;
import mineplex.hub.commands.GameModeCommand; import mineplex.hub.commands.GameModeCommand;
import mineplex.hub.commands.NewsCommand; import mineplex.hub.commands.NewsCommand;
import mineplex.hub.modules.ForcefieldManager; import mineplex.hub.modules.ForcefieldManager;
import mineplex.hub.modules.HubVisibilityManager;
import mineplex.hub.modules.JumpManager; import mineplex.hub.modules.JumpManager;
import mineplex.hub.modules.NewsManager; import mineplex.hub.modules.NewsManager;
import mineplex.hub.modules.ParkourManager; import mineplex.hub.modules.ParkourManager;
import mineplex.hub.modules.TextManager; import mineplex.hub.modules.TextManager;
import mineplex.hub.modules.HubVisibilityManager;
import mineplex.hub.modules.WorldManager; import mineplex.hub.modules.WorldManager;
import mineplex.hub.poll.PollManager; import mineplex.hub.poll.PollManager;
import mineplex.hub.tutorial.TutorialManager; import mineplex.hub.tutorial.TutorialManager;
@ -107,7 +103,7 @@ import mineplex.minecraft.game.core.damage.CustomDamageEvent;
public class HubManager extends MiniClientPlugin<HubClient> public class HubManager extends MiniClientPlugin<HubClient>
{ {
// ☃❅ Snowman! // ☃❅ Snowman!
public HubType Type = HubType.Normal; public HubType Type = HubType.Normal;
private BlockRestore _blockRestore; private BlockRestore _blockRestore;
private CoreClientManager _clientManager; private CoreClientManager _clientManager;
@ -318,7 +314,7 @@ public class HubManager extends MiniClientPlugin<HubClient>
+ "§r\n" + "§r\n"
+ "§lHow do I apply for Trainee?\n" + "§lHow do I apply for Trainee?\n"
+ "\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" + "Apply at:\n"
+ "§omineplex.com/application\n"); + "§omineplex.com/application\n");
@ -499,7 +495,10 @@ public class HubManager extends MiniClientPlugin<HubClient>
@EventHandler(priority = EventPriority.LOW) @EventHandler(priority = EventPriority.LOW)
public void AdminOP(PlayerJoinEvent event) public void AdminOP(PlayerJoinEvent event)
{ {
if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.OWNER)) // Give developers operator on their servers
boolean testServer = _plugin.getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.OWNER) || (testServer && (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.DEVELOPER) || _clientManager.Get(event.getPlayer()).GetRank() == Rank.JNR_DEV)))
event.getPlayer().setOp(true); event.getPlayer().setOp(true);
else else
event.getPlayer().setOp(false); event.getPlayer().setOp(false);
@ -899,6 +898,11 @@ public class HubManager extends MiniClientPlugin<HubClient>
return _gadgetManager; return _gadgetManager;
} }
public TreasureManager GetTreasure()
{
return _treasureManager;
}
public MountManager GetMount() public MountManager GetMount()
{ {
return _mountManager; return _mountManager;

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

@ -33,33 +33,6 @@ public class HubRepository
public void initialize(boolean us) public void initialize(boolean us)
{ {
_us = 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() public HashMap<String, String> retrieveNewsEntries()

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

@ -10,7 +10,7 @@ public class GadgetToggle extends CommandBase<HubManager>
{ {
public GadgetToggle(HubManager plugin) public GadgetToggle(HubManager plugin)
{ {
super(plugin, Rank.ADMIN, new String[] {"gadget"}); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, new String[] {"gadget"});
} }
@Override @Override

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

@ -13,7 +13,7 @@ public class GameModeCommand extends CommandBase<HubManager>
{ {
public GameModeCommand(HubManager plugin) public GameModeCommand(HubManager plugin)
{ {
super(plugin, Rank.ADMIN, new String[] {"gm"}); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, new String[] {"gm"});
} }
@Override @Override

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

@ -10,7 +10,7 @@ public class NewsCommand extends MultiCommandBase<HubManager>
{ {
public NewsCommand(HubManager plugin) public NewsCommand(HubManager plugin)
{ {
super(plugin, Rank.ADMIN, "news"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "news");
AddCommand(new NewsAddCommand(plugin)); AddCommand(new NewsAddCommand(plugin));
AddCommand(new NewsDeleteCommand(plugin)); AddCommand(new NewsDeleteCommand(plugin));

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

@ -19,7 +19,7 @@ public class NewsListCommand extends CommandBase<HubManager>
{ {
public NewsListCommand(HubManager plugin) public NewsListCommand(HubManager plugin)
{ {
super(plugin, Rank.ADMIN, "list"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "list");
} }
@Override @Override

4
Plugins/Mineplex.Hub/src/mineplex/hub/modules/ForcefieldManager.java
View File

@ -42,7 +42,7 @@ public class ForcefieldManager extends MiniPlugin
for (Player player : UtilServer.getPlayers()) for (Player player : UtilServer.getPlayers())
{ {
if (Manager.getPreferences().Get(player).HubForcefield && Manager.GetClients().Get(player).GetRank().Has(Rank.ADMIN)) if (Manager.getPreferences().Get(player).HubForcefield && (Manager.GetClients().Get(player).GetRank().Has(Rank.ADMIN) || Manager.GetClients().Get(player).GetRank() == Rank.JNR_DEV))
{ {
for (Player other : UtilServer.getPlayers()) for (Player other : UtilServer.getPlayers())
{ {
@ -56,7 +56,7 @@ public class ForcefieldManager extends MiniPlugin
if (UtilMath.offset(other, player) > range) if (UtilMath.offset(other, player) > range)
continue; continue;
if (Manager.GetClients().Get(other).GetRank().Has(Rank.ADMIN)) if (Manager.GetClients().Get(other).GetRank().Has(Rank.ADMIN) || Manager.GetClients().Get(other).GetRank() == Rank.JNR_DEV)
continue; continue;
if (Recharge.Instance.use(other, "Forcefield Bump", 500, false, false)) if (Recharge.Instance.use(other, "Forcefield Bump", 500, false, false))

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

@ -58,7 +58,7 @@ public class NewsManager extends MiniPlugin
"News Line 3", "News Line 3",
"News Line 4", "News Line 4",
}; };
RefreshNews(); RefreshNews();
} }

26
Plugins/Mineplex.Hub/src/mineplex/hub/modules/StackerManager.java
View File

@ -28,6 +28,8 @@ import mineplex.core.common.util.UtilGear;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilEvent.ActionType; import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.event.StackerEvent; import mineplex.core.event.StackerEvent;
import mineplex.core.gadget.gadgets.MorphBlock;
import mineplex.core.gadget.types.GadgetType;
import mineplex.core.projectile.IThrown; import mineplex.core.projectile.IThrown;
import mineplex.core.projectile.ProjectileManager; import mineplex.core.projectile.ProjectileManager;
import mineplex.core.projectile.ProjectileUser; import mineplex.core.projectile.ProjectileUser;
@ -105,15 +107,33 @@ public class StackerManager extends MiniPlugin implements IThrown
return; return;
} }
if (Manager.GetGadget().getActive(stacker, GadgetType.Morph) instanceof MorphBlock)
{
UtilPlayer.message(stacker, F.main("Stacker", "You cannot stack while using the Block Morph."));
return;
}
if (Manager.GetTreasure().isOpening(stacker))
return;
stackerEvent = new StackerEvent(stackee); stackerEvent = new StackerEvent(stackee);
Bukkit.getServer().getPluginManager().callEvent(stackerEvent); Bukkit.getServer().getPluginManager().callEvent(stackerEvent);
if (stackerEvent.isCancelled()) if (stackerEvent.isCancelled())
return; return;
if (stackee instanceof Player && !Manager.CanBump(((Player)stackee))) if (stackee instanceof Player)
{ {
UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is not playing stacker.")); if (!Manager.CanBump(((Player)stackee)))
return; {
UtilPlayer.message(stacker, F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is not playing stacker."));
return;
}
if (Manager.GetTreasure().isOpening((Player) stackee))
{
UtilPlayer.message(stacker, F.main("Stacker", F.main("Stacker", F.name(UtilEnt.getName(stackee)) + " is opening a chest!")));
return;
}
} }
if (stackee instanceof LivingEntity) if (stackee instanceof LivingEntity)

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.EventHandler;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import net.minecraft.server.v1_7_R4.ChatSerializer; import net.minecraft.server.v1_7_R4.ChatSerializer;
import net.minecraft.server.v1_7_R4.PacketPlayOutChat; import net.minecraft.server.v1_7_R4.PacketPlayOutChat;
import net.minecraft.util.com.google.gson.JsonObject; import net.minecraft.util.com.google.gson.JsonObject;
import mineplex.core.MiniDbClientPlugin; import mineplex.core.MiniDbClientPlugin;
import mineplex.core.account.CoreClientManager; import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
@ -212,7 +212,7 @@ public class PollManager extends MiniDbClientPlugin<PlayerPollData>
} }
@Override @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)); 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!", 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 + "",
ChatColor.RESET + "Search for chests to find loot and ", ChatColor.RESET + "Search for chests to find loot and ",

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

@ -111,6 +111,13 @@ public class BlockToss extends SkillCharge implements IThrown
return; return;
} }
// Ladder and beacon grabs
if (grab.getType() == Material.LADDER || grab.getType() == Material.BEACON)
{
UtilPlayer.message(player, F.main(GetName(), "You cannot grab this block."));
return;
}
//TrapDoor or ladder //TrapDoor or ladder
for (int x = -1; x <= 1; x++) for (int x = -1; x <= 1; x++)
{ {
@ -130,7 +137,7 @@ public class BlockToss extends SkillCharge implements IThrown
} }
//Block to Item //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 //Action
player.eject(); player.eject();
@ -235,7 +242,7 @@ public class BlockToss extends SkillCharge implements IThrown
{ {
FallingBlock thrown = (FallingBlock) data.GetThrown(); 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 //Remove Old
_falling.remove(thrown); _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,", "Release Block to release the rupture,",
"causing earth and players to fly upward,", "causing earth and players to fly upward,",
"dealing up to #4#1 inital damage." "dealing up to #4#1 initial damage."
}); });
} }

66
Plugins/Mineplex.ServerData/src/mineplex/serverdata/Utility.java
View File

@ -1,5 +1,7 @@
package mineplex.serverdata; package mineplex.serverdata;
import java.util.concurrent.ConcurrentHashMap;
import mineplex.serverdata.servers.ConnectionData; import mineplex.serverdata.servers.ConnectionData;
import mineplex.serverdata.servers.ServerManager; import mineplex.serverdata.servers.ServerManager;
import redis.clients.jedis.Jedis; import redis.clients.jedis.Jedis;
@ -15,17 +17,20 @@ import com.google.gson.GsonBuilder;
* @author Ty * @author Ty
* *
*/ */
public class Utility public class Utility
{ {
// The Gson instance used to serialize/deserialize objects in JSON form. // The Gson instance used to serialize/deserialize objects in JSON form.
private static Gson _gson = new GsonBuilder().create(); private static Gson _gson = new GsonBuilder().create();
public static Gson getGson() { return _gson; } public static Gson getGson() { return _gson; }
// map of all instantiated connection pools, distinguished by their ip:port combination
private static final ConcurrentHashMap<String, JedisPool> _pools = new ConcurrentHashMap<String, JedisPool>();
// Public static jedis pool for interacting with central default jedis repo. // Public static jedis pool for interacting with central default jedis repo.
private static JedisPool _masterPool; private static JedisPool _masterPool;
private static JedisPool _slavePool; private static JedisPool _slavePool;
/** /**
* @param object - the (non-null) object to serialize * @param object - the (non-null) object to serialize
* @return the serialized form of {@code object}. * @return the serialized form of {@code object}.
@ -34,7 +39,7 @@ public class Utility
{ {
return _gson.toJson(object); return _gson.toJson(object);
} }
/** /**
* @param serializedData - the serialized data to be deserialized * @param serializedData - the serialized data to be deserialized
* @param type - the resulting class type of the object to be deserialized * @param type - the resulting class type of the object to be deserialized
@ -44,7 +49,7 @@ public class Utility
{ {
return _gson.fromJson(serializedData, type); return _gson.fromJson(serializedData, type);
} }
/** /**
* @param delimiter - the delimiter character used to separate the concatenated elements * @param delimiter - the delimiter character used to separate the concatenated elements
* @param elements - the set of string elements to be concatenated and returned. * @param elements - the set of string elements to be concatenated and returned.
@ -54,15 +59,15 @@ public class Utility
{ {
int length = elements.length; int length = elements.length;
String result = length > 0 ? elements[0] : new String(); String result = length > 0 ? elements[0] : new String();
for (int i = 1; i < length; i++) for (int i = 1; i < length; i++)
{ {
result += delimiter + elements[i]; result += delimiter + elements[i];
} }
return result; return result;
} }
/** /**
* @return the current timestamp (in seconds) fetched from the central jedis repository * @return the current timestamp (in seconds) fetched from the central jedis repository
* for synced timestamps. * for synced timestamps.
@ -72,7 +77,7 @@ public class Utility
long currentTime = 0; long currentTime = 0;
JedisPool pool = getPool(false); JedisPool pool = getPool(false);
Jedis jedis = pool.getResource(); Jedis jedis = pool.getResource();
try try
{ {
currentTime = Long.parseLong(jedis.time().get(0)); currentTime = Long.parseLong(jedis.time().get(0));
@ -90,10 +95,10 @@ public class Utility
pool.returnResource(jedis); pool.returnResource(jedis);
} }
} }
return currentTime; return currentTime;
} }
/** /**
* @return the current timestamp (in milliseconds) fetched from the central jedis repository * @return the current timestamp (in milliseconds) fetched from the central jedis repository
* for synced timestamps. * for synced timestamps.
@ -121,22 +126,35 @@ public class Utility
pool.returnResource(jedis); pool.returnResource(jedis);
} }
} }
return currentTime * 1000; return currentTime * 1000;
} }
/** /**
* @param connData - the connection data specifying the database to be connected to. * @param connData - the connection data specifying the database to be connected to.
* @return a newly instantiated {@link JedisPool} connected to the provided {@link ConnectionData} repository. * @return a newly instantiated {@link JedisPool} connected to the provided {@link ConnectionData} repository.
*/ */
public static JedisPool generatePool(ConnectionData connData) public static JedisPool generatePool(ConnectionData connData)
{ {
JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); String key = getConnKey(connData);
jedisPoolConfig.setMaxWaitMillis(1000); JedisPool pool = _pools.get(key);
jedisPoolConfig.setMinIdle(5); if (pool == null)
return new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort()); {
JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
jedisPoolConfig.setMaxWaitMillis(1000);
jedisPoolConfig.setMinIdle(5);
jedisPoolConfig.setTestOnBorrow(true);
jedisPoolConfig.setMaxTotal(20);
jedisPoolConfig.setBlockWhenExhausted(true);
pool = new JedisPool(jedisPoolConfig, connData.getHost(), connData.getPort());
_pools.put(key, pool);
}
return pool;
} }
/** /**
* @param writeable - whether or not the Jedis connections returned should be writeable to. * @param writeable - whether or not the Jedis connections returned should be writeable to.
* @return a globally available {@link JedisPool} * @return a globally available {@link JedisPool}
@ -149,7 +167,7 @@ public class Utility
{ {
_masterPool = generatePool(ServerManager.getMasterConnection()); _masterPool = generatePool(ServerManager.getMasterConnection());
} }
return _masterPool; return _masterPool;
} }
else else
@ -157,11 +175,17 @@ public class Utility
if (_slavePool == null) if (_slavePool == null)
{ {
ConnectionData slave = ServerManager.getSlaveConnection(); ConnectionData slave = ServerManager.getSlaveConnection();
_slavePool = generatePool(slave); _slavePool = generatePool(slave);
} }
return _slavePool; return _slavePool;
} }
} }
private static String getConnKey(ConnectionData connData)
{
return connData.getHost() + ":" + connData.getPort();
}
} }

3
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java
View File

@ -83,11 +83,12 @@ public class StaffServer extends JavaPlugin
((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("efaf9a17-2304-4f42-8433-421523c308dc"), "B2_mp")); ((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("efaf9a17-2304-4f42-8433-421523c308dc"), "B2_mp"));
((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("492ff708-fe76-4c5a-b9ed-a747b5fa20a0"), "Cherdy8s")); ((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("492ff708-fe76-4c5a-b9ed-a747b5fa20a0"), "Cherdy8s"));
((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("80f40f29-4d66-4355-a32f-01a65af2a14c"), "rl6")); ((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("80f40f29-4d66-4355-a32f-01a65af2a14c"), "rl6"));
((CraftServer)getServer()).getHandle().addWhitelist(new GameProfile(UUID.fromString("cf85f470-5248-4978-8208-435736fa136e"), "RustyRoo"));
((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("377bdea3-badc-448d-81c1-65db43b17ea4"), "Strutt20")); ((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("377bdea3-badc-448d-81c1-65db43b17ea4"), "Strutt20"));
((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("efaf9a17-2304-4f42-8433-421523c308dc"), "B2_mp")); ((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("efaf9a17-2304-4f42-8433-421523c308dc"), "B2_mp"));
((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("2d5fd31b-0aa5-41db-a62d-a4611a24349a"), "ishh")); ((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("2d5fd31b-0aa5-41db-a62d-a4611a24349a"), "ishh"));
((CraftServer)getServer()).getHandle().addOp(new GameProfile(UUID.fromString("cf85f470-5248-4978-8208-435736fa136e"), "RustyRoo"));
} }
} }

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) else if (amount == 8)
tempExp = 220000; tempExp = 220000;
final int experience = tempExp; final long experience = tempExp;
Plugin.getClientManager().loadClientByName(playerName, new Runnable() Plugin.getClientManager().loadClientByName(playerName, new Runnable()
{ {

31
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.PlayerLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.event.server.ServerListPingEvent; import org.bukkit.event.server.ServerListPingEvent;
import org.bukkit.potion.PotionEffect;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import com.google.common.base.Objects; 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.DisguiseCommand;
import nautilus.game.arcade.command.GameCommand; import nautilus.game.arcade.command.GameCommand;
import nautilus.game.arcade.command.WriteCommand; 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.events.GameStateChangeEvent;
import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game;
import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.Game.GameState;
@ -407,7 +408,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{ {
addCommand(new GameCommand(this)); addCommand(new GameCommand(this));
addCommand(new WriteCommand(this)); addCommand(new WriteCommand(this));
addCommand(new YoutubeCommand(this)); addCommand(new KitUnlockCommand(this));
addCommand(new DisguiseCommand(this)); addCommand(new DisguiseCommand(this));
} }
@ -652,7 +653,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation
return; return;
} }
if (!GetServerConfig().PublicServer) if (!GetServerConfig().PublicServer || GetServerConfig().PlayerServerWhitelist)
{ {
event.setMotd(ChatColor.GRAY + "Private"); event.setMotd(ChatColor.GRAY + "Private");
return; return;
@ -828,6 +829,18 @@ public class ArcadeManager extends MiniPlugin implements IRelation
} }
} }
@EventHandler(priority = EventPriority.LOW)
public void AdminOP(PlayerJoinEvent event)
{
// Give developers operator on their servers
boolean testServer = _plugin.getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
if (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.OWNER) || (testServer && (_clientManager.Get(event.getPlayer()).GetRank().Has(Rank.DEVELOPER) || _clientManager.Get(event.getPlayer()).GetRank() == Rank.JNR_DEV)))
event.getPlayer().setOp(true);
else
event.getPlayer().setOp(false);
}
public boolean IsAlive(Player player) public boolean IsAlive(Player player)
{ {
if (_game == null) if (_game == null)
@ -840,6 +853,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
{ {
player.setGameMode(GameMode.SURVIVAL); player.setGameMode(GameMode.SURVIVAL);
player.setAllowFlight(false); player.setAllowFlight(false);
player.setFlySpeed(0.1F);
UtilInv.Clear(player); UtilInv.Clear(player);
((CraftEntity) player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0)); ((CraftEntity) player).getHandle().getDataWatcher().watch(0, Byte.valueOf((byte) 0));
@ -871,6 +886,8 @@ public class ArcadeManager extends MiniPlugin implements IRelation
//Remove all conditions //Remove all conditions
GetCondition().EndCondition(player, null, null); GetCondition().EndCondition(player, null, null);
for (PotionEffect potion : player.getActivePotionEffects())
player.removePotionEffect(potion.getType());
HubClock(player); HubClock(player);
@ -1207,21 +1224,21 @@ public class ArcadeManager extends MiniPlugin implements IRelation
return _game != null && _game.InProgress(); return _game != null && _game.InProgress();
} }
public boolean isYoutuber(Player player) public boolean hasKitsUnlocked(Player player)
{ {
return _youtube.contains(player); return _youtube.contains(player);
} }
public void setYoutuber(Player caller) public void toggleUnlockKits(Player caller)
{ {
if (_youtube.remove(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 else
{ {
_youtube.add(caller); _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.hideseek.HideSeek;
import nautilus.game.arcade.game.games.holeinwall.HoleInTheWall; import nautilus.game.arcade.game.games.holeinwall.HoleInTheWall;
import nautilus.game.arcade.game.games.horsecharge.Horse; 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.micro.Micro;
import nautilus.game.arcade.game.games.milkcow.MilkCow; import nautilus.game.arcade.game.games.milkcow.MilkCow;
import nautilus.game.arcade.game.games.minestrike.MineStrike; import nautilus.game.arcade.game.games.minestrike.MineStrike;
@ -85,6 +86,7 @@ public enum GameType
HideSeek(HideSeek.class, GameDisplay.HideSeek), HideSeek(HideSeek.class, GameDisplay.HideSeek),
HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall), HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
Horse(Horse.class, GameDisplay.Horse), Horse(Horse.class, GameDisplay.Horse),
Lobbers(BombLobbers.class, GameDisplay.Lobbers),
Micro(Micro.class, GameDisplay.Micro), Micro(Micro.class, GameDisplay.Micro),
MilkCow(MilkCow.class, GameDisplay.MilkCow), 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 MineStrike(MineStrike.class, GameDisplay.MineStrike, "http://chivebox.com/file/c/assets.zip", true),// Temp set to CHAMPIONS to fix UI bug
@ -113,7 +115,7 @@ public enum GameType
TurfWars(TurfForts.class, GameDisplay.TurfWars), TurfWars(TurfForts.class, GameDisplay.TurfWars),
UHC(UHC.class, GameDisplay.UHC), UHC(UHC.class, GameDisplay.UHC),
WitherAssault(WitherGame.class, GameDisplay.WitherAssault), 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), ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
Build(Build.class, GameDisplay.Build), Build(Build.class, GameDisplay.Build),
Cards(Cards.class, GameDisplay.Cards), Cards(Cards.class, GameDisplay.Cards),

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(); Player player = event.getPlayer();
if (!Manager.GetGame().IsAlive(player))
return;
if (!UtilGear.isMat(player.getItemInHand(), Material.MUSHROOM_SOUP)) if (!UtilGear.isMat(player.getItemInHand(), Material.MUSHROOM_SOUP))
return; return;

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/command/DisguiseCommand.java
View File

@ -3,9 +3,8 @@ package nautilus.game.arcade.command;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import nautilus.game.arcade.ArcadeManager;
import net.minecraft.util.com.mojang.authlib.GameProfile; import net.minecraft.util.com.mojang.authlib.GameProfile;
import mineplex.core.command.CommandBase; import mineplex.core.command.CommandBase;
import mineplex.core.common.Rank; import mineplex.core.common.Rank;
import mineplex.core.common.util.C; import mineplex.core.common.util.C;
@ -13,12 +12,13 @@ import mineplex.core.common.util.ProfileLoader;
import mineplex.core.common.util.UUIDFetcher; import mineplex.core.common.util.UUIDFetcher;
import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilPlayer;
import mineplex.core.disguise.disguises.DisguisePlayer; import mineplex.core.disguise.disguises.DisguisePlayer;
import nautilus.game.arcade.ArcadeManager;
public class DisguiseCommand extends CommandBase<ArcadeManager> public class DisguiseCommand extends CommandBase<ArcadeManager>
{ {
public DisguiseCommand(ArcadeManager plugin) public DisguiseCommand(ArcadeManager plugin)
{ {
super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH}, "disguise"); super(plugin, Rank.ADMIN, new Rank[] {Rank.YOUTUBE, Rank.TWITCH, Rank.JNR_DEV}, "disguise");
} }
@Override @Override

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) 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 StartCommand(Plugin));
AddCommand(new StopCommand(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.command.CommandBase;
import mineplex.core.common.Rank; 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 @Override
public void Execute(Player caller, String[] args) 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) 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 @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) 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 @Override

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

@ -11,7 +11,7 @@ public class WriteCommand extends CommandBase<ArcadeManager>
{ {
public WriteCommand(ArcadeManager plugin) public WriteCommand(ArcadeManager plugin)
{ {
super(plugin, Rank.ADMIN, "write"); super(plugin, Rank.ADMIN, new Rank[] {Rank.JNR_DEV}, "write");
} }
@Override @Override

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

@ -36,6 +36,8 @@ public class GameServerConfig
public boolean PlayerKickIdle = true; public boolean PlayerKickIdle = true;
public boolean PublicServer = true; public boolean PublicServer = true;
public boolean PlayerServerWhitelist = false;
public boolean IsValid() public boolean IsValid()
{ {

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[] new String[]
{ {
"Agile warrior trained in the ways axe combat." "Agile warrior trained in the ways of axe combat."
}, },
new Perk[] 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; 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() + "!")); UtilPlayer.message(Player, F.main("Game", "You placed " + particleType.getFriendlyName() + "!"));

28
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/common/Domination.java
View File

@ -6,12 +6,17 @@ import java.util.HashMap;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.block.BlockPhysicsEvent;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.entity.ItemDespawnEvent; import org.bukkit.event.entity.ItemDespawnEvent;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType; import org.bukkit.event.inventory.InventoryType;
@ -127,6 +132,29 @@ public class Domination extends TeamGame
team.SetColor(ChatColor.BLUE); team.SetColor(ChatColor.BLUE);
} }
@EventHandler(priority = EventPriority.HIGHEST)
public void blockliquidFlow(BlockPhysicsEvent event)
{
Material matOfBlock = event.getBlock().getType();
if (matOfBlock == Material.STATIONARY_WATER || matOfBlock == Material.SAND || matOfBlock == Material.GRAVEL || matOfBlock == Material.STATIONARY_LAVA)
{
event.setCancelled(true);
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onTNTExplode(EntityExplodeEvent event)
{
if (!IsLive())
return;
if (event.getEntityType() == EntityType.PRIMED_TNT)
{
event.setCancelled(true);
}
}
@EventHandler @EventHandler
public void Updates(UpdateEvent event) public void Updates(UpdateEvent event)
{ {

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