Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex
This commit is contained in:
Jonathan Williams
commit
efa06d370b
@ -7,7 +7,7 @@
|
||||
</list>
|
||||
</component>
|
||||
<component name="IdProvider" IDEtalkID="7E81636CD93857493DFE224533ECF492" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" 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" />
|
||||
</component>
|
||||
</project>
|
||||
@ -35,7 +35,7 @@ public class MotdManager implements Listener, Runnable
|
||||
Region.ALL, GlobalMotd.class, "globalMotd");
|
||||
run();
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void serverPing(ProxyPingEvent event)
|
||||
{
|
||||
|
||||
@ -5,7 +5,7 @@ import com.neustar.ultra.api.webservice.v01.UltraWSException;
|
||||
/*
|
||||
* User: jbodner
|
||||
* Date: 1/28/13
|
||||
* Time: 1:11 PM
|
||||
* Time: 1:11 PM4
|
||||
*
|
||||
* Copyright 2000-2013 NeuStar, Inc. All rights reserved.
|
||||
* NeuStar, the Neustar logo and related names and logos are registered
|
||||
|
||||
@ -83,6 +83,51 @@ public enum Achievement
|
||||
new String[]{"Have 5 Necromanced Skeletons alive"},
|
||||
new int[]{1},
|
||||
AchievementCategory.SURVIVAL_GAMES),
|
||||
|
||||
//SkyWars
|
||||
SKYWARS_WINS("Sky King",2000,
|
||||
new String[]{"SkyWars.Wins"},
|
||||
new String[]{"Win 50 Games of SkyWars"},
|
||||
new int[]{50},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
SKYWARS_BOMBER("Master Bomber",500,
|
||||
new String[]{"SkyWars.DeathBomber"},
|
||||
new String[]{"Kill 3 Players with \"Super Throwing TNT\" in a Single Game."},
|
||||
new int[]{1},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
SKYWARS_TNT("TNT Hoarder",250,
|
||||
new String[]{"SkyWars.BombPickups"},
|
||||
new String[]{"Pickup 100 \"Super Throwing TNT\"s"},
|
||||
new int[]{100},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
SKYWARS_ZOMBIE_KILLS("Left For Dead",750,
|
||||
new String[]{"SkyWars.ZombieKills"},
|
||||
new String[]{"Kill 120 Zombies"},
|
||||
new int[]{120},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
SKYWARS_PLAYER_KILLS("Cold Blooded Killer",500,
|
||||
new String[]{"SkyWars.Kills"},
|
||||
new String[]{"Kill 250 Players"},
|
||||
new int[]{250},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
SKYWARS_NOCHEST("Survivalist",1000,
|
||||
new String[]{"SkyWars.NoChest"},
|
||||
new String[]{"Win a Game Without Opening a Chest"},
|
||||
new int[]{1},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
SKYWARS_NOARMOR("Bare Minimum",1000,
|
||||
new String[]{"SkyWars.NoArmor"},
|
||||
new String[]{"Win a Game With No Armor"},
|
||||
new int[]{1},
|
||||
AchievementCategory.SKYWARS),
|
||||
|
||||
|
||||
|
||||
//UHC
|
||||
UHC_WINS("Ultimate Winner", 600,
|
||||
@ -302,7 +347,7 @@ public enum Achievement
|
||||
new String[]{"Be the last alive on your team", "and kill 3 enemy players"},
|
||||
new int[]{1},
|
||||
AchievementCategory.SUPER_PAINTBALL),
|
||||
|
||||
|
||||
//Sheep Quest
|
||||
SHEEP_QUEST_WINS("Hungry Hungry Hippo", 600,
|
||||
new String[]{"Sheep Quest.Wins"},
|
||||
|
||||
@ -31,6 +31,10 @@ public enum AchievementCategory
|
||||
new StatDisplay[] { StatDisplay.WINS, StatDisplay.LOSSES, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
|
||||
Material.TNT, 0, GameCategory.CLASSICS, null),
|
||||
|
||||
SKYWARS("SkyWars",null,
|
||||
new StatDisplay[]{StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED},
|
||||
Material.INK_SACK, 0,GameCategory.SURVIVAL, "Destructor Kit"),
|
||||
|
||||
WIZARDS("Wizards", null,
|
||||
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
|
||||
Material.BLAZE_ROD, 0, GameCategory.SURVIVAL, "Extra Class Skills"),
|
||||
@ -112,16 +116,14 @@ public enum AchievementCategory
|
||||
SNAKE("Snake", null,
|
||||
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
|
||||
Material.WOOL, 4, GameCategory.ARCADE, null),
|
||||
|
||||
|
||||
BACON_BRAWL("Bacon Brawl", null,
|
||||
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
|
||||
Material.PORK, 0, GameCategory.ARCADE, null),
|
||||
|
||||
MICRO_BATTLE("Micro Battle", null,
|
||||
new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED },
|
||||
Material.LAVA, 0, GameCategory.ARCADE, null),
|
||||
|
||||
;
|
||||
Material.LAVA, 0, GameCategory.ARCADE, null);
|
||||
|
||||
|
||||
private String _name;
|
||||
|
||||
@ -44,9 +44,9 @@ public class AchievementMainPage extends ShopPageBase<AchievementManager, Achiev
|
||||
"XXXXOXXXX",
|
||||
"XOXOXOXOX",
|
||||
"XOXOXOXOX",
|
||||
"XOXOXOXOX").getItemSlots();
|
||||
"OXOXOXOXO").getItemSlots();
|
||||
int listSlot = 0;
|
||||
|
||||
|
||||
for (AchievementCategory category : AchievementCategory.values())
|
||||
{
|
||||
if (category.getGameCategory() == AchievementCategory.GameCategory.ARCADE)
|
||||
|
||||
@ -1,23 +1,20 @@
|
||||
package mineplex.core.donation.command;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import mineplex.core.account.CoreClient;
|
||||
import mineplex.core.command.CommandBase;
|
||||
import mineplex.core.common.Rank;
|
||||
import mineplex.core.common.util.Callback;
|
||||
import mineplex.core.common.util.F;
|
||||
import mineplex.core.common.util.UUIDFetcher;
|
||||
import mineplex.core.common.util.UtilPlayer;
|
||||
import mineplex.core.donation.DonationManager;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class CoinCommand extends CommandBase<DonationManager>
|
||||
{
|
||||
public CoinCommand(DonationManager plugin)
|
||||
{
|
||||
super(plugin, Rank.ADMIN, "coin");
|
||||
super(plugin, Rank.ULTRA, "coin");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@ -1,18 +1,15 @@
|
||||
package mineplex.core.donation.command;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
import mineplex.core.account.CoreClient;
|
||||
import mineplex.core.command.CommandBase;
|
||||
import mineplex.core.common.Rank;
|
||||
import mineplex.core.common.util.Callback;
|
||||
import mineplex.core.common.util.F;
|
||||
import mineplex.core.common.util.UUIDFetcher;
|
||||
import mineplex.core.common.util.UtilPlayer;
|
||||
import mineplex.core.donation.DonationManager;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class GoldCommand extends CommandBase<DonationManager>
|
||||
{
|
||||
public GoldCommand(DonationManager plugin)
|
||||
|
||||
@ -7,9 +7,7 @@ import mineplex.core.MiniPlugin;
|
||||
import mineplex.core.updater.UpdateType;
|
||||
import mineplex.core.updater.event.UpdateEvent;
|
||||
import net.minecraft.server.v1_7_R4.CraftingManager;
|
||||
import net.minecraft.server.v1_7_R4.EntityTracker;
|
||||
import net.minecraft.server.v1_7_R4.IInventory;
|
||||
import net.minecraft.server.v1_7_R4.IntHashMap;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
|
||||
@ -10,6 +10,8 @@ public enum Category
|
||||
PermMute,
|
||||
Other; // Represents perm ban - (or old perm mutes)
|
||||
|
||||
//test
|
||||
|
||||
public static boolean contains(String s)
|
||||
{
|
||||
try
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpcore-4.2.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/gson-2.2.1.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/javax.mail.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Database"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -34,7 +34,7 @@ import mineplex.game.clans.shop.pvp.PvpShop;
|
||||
public class Clans extends JavaPlugin
|
||||
{
|
||||
private String WEB_CONFIG = "webServer";
|
||||
|
||||
|
||||
//Modules
|
||||
private CoreClientManager _clientManager;
|
||||
private DonationManager _donationManager;
|
||||
@ -77,7 +77,7 @@ public class Clans extends JavaPlugin
|
||||
AntiHack.Instance.setKick(false);
|
||||
|
||||
BlockRestore blockRestore = new BlockRestore(this);
|
||||
|
||||
|
||||
IgnoreManager ignoreManager = new IgnoreManager(this, _clientManager, preferenceManager, portal);
|
||||
Chat chat = new Chat(this, _clientManager, preferenceManager, serverStatusManager.getCurrentServerName());
|
||||
new MessageManager(this, _clientManager, preferenceManager, ignoreManager, punish, new FriendManager(this, _clientManager, preferenceManager, portal), chat);
|
||||
|
||||
@ -41,6 +41,7 @@ public class Farming extends MiniPlugin
|
||||
ItemStackFactory.Instance.CreateStack(Material.GOLDEN_APPLE));
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
@EventHandler
|
||||
public void BlockPlace(BlockPlaceEvent event)
|
||||
{
|
||||
|
||||
@ -521,12 +521,14 @@ public class HubManager extends MiniClientPlugin<HubClient>
|
||||
playerName = AprilFoolsManager.Instance.getName(player);
|
||||
|
||||
//Public Message
|
||||
if (_clientManager.Get(player).GetRank() != Rank.LEGEND)
|
||||
event.setJoinMessage(null);
|
||||
else
|
||||
{
|
||||
event.setJoinMessage(C.cGreen + C.Bold + "Legend " + playerName + " has joined!");
|
||||
}
|
||||
event.setJoinMessage(null);
|
||||
|
||||
// if (_clientManager.Get(player).GetRank() != Rank.LEGEND)
|
||||
// event.setJoinMessage(null);
|
||||
// else
|
||||
// {
|
||||
// event.setJoinMessage(C.cGreen + C.Bold + "Legend " + playerName + " has joined!");
|
||||
// }
|
||||
|
||||
//Teleport
|
||||
player.teleport(GetSpawn().add(0, 10, 0));
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/bukkit.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.ServerData"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre7"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-pool2-2.2.jar"/>
|
||||
@ -12,5 +11,6 @@
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/httpclient-4.2.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/commons-codec-1.6.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/gson-2.2.1.jar"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_25"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -7,8 +7,6 @@ import mineplex.core.achievement.AchievementManager;
|
||||
import mineplex.core.antihack.AntiHack;
|
||||
import mineplex.core.chat.Chat;
|
||||
import mineplex.core.command.CommandCenter;
|
||||
import mineplex.core.common.util.ProfileLoader;
|
||||
import mineplex.core.common.util.UUIDFetcher;
|
||||
import mineplex.core.creature.Creature;
|
||||
import mineplex.core.donation.DonationManager;
|
||||
import mineplex.core.inventory.InventoryManager;
|
||||
@ -24,7 +22,6 @@ import mineplex.core.status.ServerStatusManager;
|
||||
import mineplex.core.updater.FileUpdater;
|
||||
import mineplex.core.updater.Updater;
|
||||
import mineplex.staffServer.customerSupport.CustomerSupport;
|
||||
import mineplex.staffServer.password.Password;
|
||||
import mineplex.staffServer.salespackage.SalesPackageManager;
|
||||
import net.minecraft.server.v1_7_R4.MinecraftServer;
|
||||
import net.minecraft.util.com.mojang.authlib.GameProfile;
|
||||
|
||||
@ -2,33 +2,31 @@ package mineplex.staffServer.customerSupport;
|
||||
|
||||
import java.util.HashSet;
|
||||
|
||||
import mineplex.core.MiniPlugin;
|
||||
import mineplex.core.account.CoreClient;
|
||||
import mineplex.core.account.CoreClientManager;
|
||||
import mineplex.core.common.Rank;
|
||||
import mineplex.core.common.util.C;
|
||||
import mineplex.core.common.util.F;
|
||||
import mineplex.core.common.util.NautHashMap;
|
||||
import mineplex.core.donation.DonationManager;
|
||||
import mineplex.core.donation.Donor;
|
||||
import mineplex.core.donation.repository.token.CoinTransactionToken;
|
||||
import mineplex.core.donation.repository.token.TransactionToken;
|
||||
import mineplex.staffServer.salespackage.SalesPackageManager;
|
||||
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.block.BlockBreakEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent;
|
||||
import org.bukkit.event.entity.FoodLevelChangeEvent;
|
||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||
import org.bukkit.event.entity.FoodLevelChangeEvent;
|
||||
import org.bukkit.event.player.AsyncPlayerChatEvent;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import mineplex.core.MiniPlugin;
|
||||
import mineplex.core.account.CoreClient;
|
||||
import mineplex.core.account.CoreClientManager;
|
||||
import mineplex.core.common.Rank;
|
||||
import mineplex.core.common.jsonchat.JsonMessage;
|
||||
import mineplex.core.common.util.C;
|
||||
import mineplex.core.common.util.F;
|
||||
import mineplex.core.common.util.NautHashMap;
|
||||
import mineplex.core.common.util.UtilPlayer;
|
||||
import mineplex.core.donation.DonationManager;
|
||||
import mineplex.core.donation.Donor;
|
||||
import mineplex.core.donation.repository.token.CoinTransactionToken;
|
||||
import mineplex.core.donation.repository.token.TransactionToken;
|
||||
import mineplex.staffServer.salespackage.SalesPackageManager;
|
||||
|
||||
public class CustomerSupport extends MiniPlugin
|
||||
{
|
||||
private CoreClientManager _clientManager;
|
||||
|
||||
@ -9,3 +9,287 @@ org.eclipse.jdt.core.compiler.debug.sourceFile=generate
|
||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.source=1.7
|
||||
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
|
||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
|
||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
|
||||
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
|
||||
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
|
||||
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
|
||||
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
|
||||
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
|
||||
org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
|
||||
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_field=0
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
|
||||
org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
|
||||
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
|
||||
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
|
||||
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
|
||||
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
|
||||
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
|
||||
org.eclipse.jdt.core.formatter.comment.format_header=false
|
||||
org.eclipse.jdt.core.formatter.comment.format_html=true
|
||||
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
|
||||
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
|
||||
org.eclipse.jdt.core.formatter.comment.format_source_code=true
|
||||
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
|
||||
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
|
||||
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
|
||||
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
|
||||
org.eclipse.jdt.core.formatter.comment.line_length=80
|
||||
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
|
||||
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
|
||||
org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
|
||||
org.eclipse.jdt.core.formatter.compact_else_if=true
|
||||
org.eclipse.jdt.core.formatter.continuation_indentation=2
|
||||
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
|
||||
org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
|
||||
org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
|
||||
org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
|
||||
org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
|
||||
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
|
||||
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
|
||||
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
|
||||
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
|
||||
org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
|
||||
org.eclipse.jdt.core.formatter.indent_empty_lines=false
|
||||
org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
|
||||
org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
|
||||
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
|
||||
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
|
||||
org.eclipse.jdt.core.formatter.indentation.size=4
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_label=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
|
||||
org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
|
||||
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
|
||||
org.eclipse.jdt.core.formatter.join_lines_in_comments=true
|
||||
org.eclipse.jdt.core.formatter.join_wrapped_lines=true
|
||||
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=true
|
||||
org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
|
||||
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
|
||||
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
|
||||
org.eclipse.jdt.core.formatter.lineSplit=80
|
||||
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
|
||||
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
|
||||
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
|
||||
org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
|
||||
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
|
||||
org.eclipse.jdt.core.formatter.tabulation.char=tab
|
||||
org.eclipse.jdt.core.formatter.tabulation.size=4
|
||||
org.eclipse.jdt.core.formatter.use_on_off_tags=false
|
||||
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
|
||||
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
|
||||
org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
|
||||
org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
|
||||
|
||||
@ -0,0 +1,3 @@
|
||||
eclipse.preferences.version=1
|
||||
formatter_profile=_Mineplex
|
||||
formatter_settings_version=12
|
||||
@ -63,7 +63,7 @@ public class Arcade extends JavaPlugin
|
||||
private DamageManager _damageManager;
|
||||
|
||||
private ArcadeManager _gameManager;
|
||||
|
||||
|
||||
private ServerConfiguration _serverConfiguration;
|
||||
|
||||
@Override
|
||||
|
||||
@ -880,8 +880,10 @@ public class ArcadeManager extends MiniPlugin implements IRelation
|
||||
public ArrayList<String> LoadFiles(String gameName)
|
||||
{
|
||||
TimingManager.start("ArcadeManager LoadFiles");
|
||||
|
||||
File folder = new File(".." + File.separatorChar + ".." + File.separatorChar + "update" + File.separatorChar
|
||||
+ "maps" + File.separatorChar + gameName);
|
||||
System.out.println(folder.getAbsolutePath()+" -=-=-=-=-=" );
|
||||
if (!folder.exists())
|
||||
folder.mkdirs();
|
||||
|
||||
|
||||
@ -35,6 +35,7 @@ import nautilus.game.arcade.game.games.quiver.QuiverTeams;
|
||||
import nautilus.game.arcade.game.games.runner.Runner;
|
||||
import nautilus.game.arcade.game.games.searchanddestroy.SearchAndDestroy;
|
||||
import nautilus.game.arcade.game.games.sheep.SheepGame;
|
||||
import nautilus.game.arcade.game.games.skywars.SkyWars;
|
||||
import nautilus.game.arcade.game.games.smash.SuperSmash;
|
||||
import nautilus.game.arcade.game.games.smash.SuperSmashDominate;
|
||||
import nautilus.game.arcade.game.games.smash.SuperSmashTeam;
|
||||
@ -92,6 +93,7 @@ public enum GameType
|
||||
Runner(Runner.class, "Runner", Material.LEATHER_BOOTS, (byte)0, GameCategory.ARCADE, 31),
|
||||
SearchAndDestroy(SearchAndDestroy.class, "Search and Destroy", Material.TNT, (byte)0, GameCategory.SURVIVAL, 32),
|
||||
Sheep(SheepGame.class, "Sheep Quest", Material.WOOL, (byte)4, GameCategory.ARCADE, 33),
|
||||
|
||||
Smash(SuperSmash.class, "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.CLASSICS, 34),
|
||||
SmashDomination(SuperSmashDominate.class, "Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.EXTRA, 36),
|
||||
SmashTeams(SuperSmashTeam.class, "Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4, GameCategory.TEAM_VARIANT, 35),
|
||||
@ -113,7 +115,8 @@ public enum GameType
|
||||
|
||||
Build(Build.class, "Master Builders", Material.BRICK, (byte)0, GameCategory.CLASSICS, 50),
|
||||
Cards(Cards.class, "Craft Against Humanity", Material.MAP, (byte)0, GameCategory.CLASSICS, 51),
|
||||
|
||||
Skywars(SkyWars.class, "SkyWars", Material.CHEST, (byte)0, GameCategory.SURVIVAL, 52),
|
||||
|
||||
Event(EventGame.class, "Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999);
|
||||
|
||||
String _name;
|
||||
|
||||
@ -209,7 +209,7 @@ public class Bridge extends TeamGame implements OreObsfucation
|
||||
new BridgesSniperStatTracker(this),
|
||||
new TntMinerStatTracker(this),
|
||||
new KillFastStatTracker(this, 4, 10, "Rampage"),
|
||||
new DeathBomberStatTracker(this)
|
||||
new DeathBomberStatTracker(this, 5)
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ public class KitDestructor extends Kit
|
||||
|
||||
new Perk[]
|
||||
{
|
||||
new PerkDestructor(40, 2)
|
||||
new PerkDestructor(40, 2, 400, false)
|
||||
},
|
||||
EntityType.ZOMBIE,
|
||||
new ItemStack(Material.ENDER_PEARL));
|
||||
|
||||
@ -107,7 +107,7 @@ public class Draw extends SoloGame
|
||||
this.Damage = false;
|
||||
this.HungerSet = 20;
|
||||
this.WorldTimeSet = 8000;
|
||||
|
||||
|
||||
_words = new String[]
|
||||
{
|
||||
"Bird", "Volcano", "Sloth", "Love", "Dance", "Hair", "Glasses", "Domino", "Dice", "Computer", "Top Hat", "Beard", "Wind", "Rain", "Minecraft", "Push", "Fighting", "Juggle", "Clown", "Miner", "Creeper", "Ghast", "Spider", "Punch", "Roll", "River", "Desert", "Cold", "Pregnant", "Photo", "Quick", "Mario", "Luigi", "Bridge", "Turtle", "Door Knob", "Mineplex", "Binoculars", "Telescope", "Planet", "Mountain Bike", "Moon", "Comet", "Flower", "Squirrel", "Horse Riding", "Chef", "Elephant", "Yoshi", "Shotgun", "Pistol", "James Bond", "Money", "Salt and Pepper", "Truck", "Helicopter", "Hot Air Balloon", "Sprout", "Yelling", "Muscles", "Skinny", "Zombie", "Lava", "Snake", "Motorbike", "Whale", "Boat", "Letterbox", "Window", "Lollipop", "Handcuffs", "Police", "Uppercut", "Windmill", "Eyepatch", "Campfire", "Rainbow", "Storm", "Pikachu", "Charmander", "Tornado", "Crying", "King", "Hobo", "Worm", "Snail", "XBox", "Playstation", "Nintendo", "Duck", "Pull", "Dinosaur", "Alligator", "Ankle", "Angel", "Acorn", "Bread", "Booty", "Bacon", "Crown", "Donut", "Drill", "Leash", "Magic", "Wizard", "Igloo", "Plant", "Screw", "Rifle", "Puppy", "Stool", "Stamp", "Letter", "Witch", "Zebra", "Wagon", "Compass", "Watch", "Clock", "Time", "Cyclops", "Coconut", "Hang", "Penguin", "Confused", "Bucket", "Lion", "Rubbish", "Spaceship", "Bowl", "Shark", "Pizza", "Pyramid", "Dress", "Pants", "Shorts", "Boots", "Boy", "Girl", "Math", "Sunglasses", "Frog", "Chair", "Cake", "Grapes", "Kiss", "Snorlax", "Earth", "Spaghetti", "Couch", "Family", "Milk", "Blood", "Pig", "Giraffe", "Mouse", "Couch", "Fat", "Chocolate", "Camel", "Cheese", "Beans", "Water", "Chicken", "Cannibal", "Zipper", "Book", "Swimming", "Horse", "Paper", "Toaster", "Television", "Hammer", "Piano", "Sleeping", "Yawn", "Sheep", "Night", "Chest", "Lamp", "Redstone", "Grass", "Plane", "Ocean", "Lake", "Melon", "Pumpkin", "Gift", "Fishing", "Pirate", "Lightning", "Stomach", "Belly Button", "Fishing Rod", "Iron Ore", "Diamonds", "Emeralds", "Nether Portal", "Ender Dragon", "Rabbit", "Harry Potter", "Torch", "Light", "Battery", "Zombie Pigman", "Telephone", "Tent", "Hand", "Traffic Lights", "Anvil", "Tail", "Umbrella", "Piston", "Skeleton", "Spikes", "Bridge", "Bomb", "Spoon", "Rainbow", "Staircase", "Poop", "Dragon", "Fire", "Apple", "Shoe", "Squid", "Cookie", "Tooth", "Camera", "Sock", "Monkey", "Unicorn", "Smile", "Pool", "Rabbit", "Cupcake", "Pancake", "Princess", "Castle", "Flag", "Planet", "Stars", "Camp Fire", "Rose", "Spray", "Pencil", "Ice Cream", "Toilet", "Moose", "Bear", "Beer", "Batman", "Eggs", "Teapot", "Golf Club", "Tennis Racket", "Shield", "Crab", "Pot of Gold", "Cactus", "Television", "Pumpkin Pie", "Chimney", "Stable", "Nether", "Wither", "Beach", "Stop Sign", "Chestplate", "Pokeball", "Christmas Tree", "Present", "Snowflake", "Laptop", "Superman", "Football", "Basketball", "Creeper", "Tetris", "Jump", "Ninja", "Baby", "Troll Face", "Grim Reaper", "Temple", "Explosion", "Vomit", "Ants", "Barn", "Burn", "Baggage", "Frisbee", "Iceberg", "Sleeping", "Dream", "Snorlax", "Balloons", "Elevator", "Alligator", "Bikini", "Butterfly", "Bumblebee", "Pizza", "Jellyfish", "Sideburns", "Speedboat", "Treehouse", "Water Gun", "Drink", "Hook", "Dance", "Fall", "Summer", "Autumn", "Spring", "Winter", "Night Time", "Galaxy", "Sunrise", "Sunset", "Picnic", "Snowflake", "Holding Hands", "America", "Laptop", "Anvil", "Bagel", "Bench", "Cigar", "Darts", "Muffin", "Queen", "Wheat", "Dolphin", "Scarf", "Swing", "Thumb", "Tomato", "Alcohol", "Armor", "Alien", "Beans", "Cheek", "Phone", "Keyboard", "Orange", "Calculator", "Paper", "Desk", "Disco", "Elbow", "Drool", "Giant", "Golem", "Grave", "Llama", "Moose", "Party", "Panda", "Plumber", "Salsa", "Salad", "Skunk", "Skull", "Stump", "Sugar", "Ruler", "Bookcase", "Hamster", "Soup", "Teapot", "Towel", "Waist", "Archer", "Anchor", "Bamboo", "Branch", "Booger", "Carrot", "Cereal", "Coffee", "Wolf", "Crayon", "Finger", "Forest", "Hotdog", "Burger", "Obsidian", "Pillow", "Swing", "YouTube", "Farm", "Rain", "Cloud", "Frozen", "Garbage", "Music", "Twitter", "Facebook", "Santa Hat", "Rope", "Neck", "Sponge", "Sushi", "Noodles", "Soup", "Tower", "Berry", "Capture", "Prison", "Robot", "Trash", "School", "Skype", "Snowman", "Crowd", "Bank", "Mudkip", "Joker", "Lizard", "Tiger", "Royal", "Erupt", "Wizard", "Stain", "Cinema", "Notebook", "Blanket", "Paint", "Guard", "Astronaut" , "Slime" , "Mansion" , "Radar" , "Thorn" , "Tears" , "Tiny" , "Candy" , "Pepsi" , "Flint" , "Draw My Thing" , "Rice" , "Shout" , "Prize" , "Skirt" , "Thief" , "Syrup" , "Kirby" , "Brush" , "Violin", "Car", "Sun", "Eye", "Bow", "Axe", "Face", "Mushroom", "Guitar", "Book",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,144 @@
|
||||
package nautilus.game.arcade.game.games.skywars.data;
|
||||
|
||||
import mineplex.core.common.util.C;
|
||||
import mineplex.core.common.util.F;
|
||||
import mineplex.core.common.util.UtilFirework;
|
||||
import mineplex.core.common.util.UtilPlayer;
|
||||
import mineplex.core.common.util.UtilTime;
|
||||
import mineplex.core.itemstack.ItemStackFactory;
|
||||
import nautilus.game.arcade.game.GameTeam;
|
||||
import nautilus.game.arcade.game.games.skywars.SkyWars;
|
||||
import nautilus.game.arcade.game.games.skywars.events.TNTPickupEvent;
|
||||
|
||||
import org.bukkit.Color;
|
||||
import org.bukkit.FireworkEffect;
|
||||
import org.bukkit.FireworkEffect.Type;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.block.BlockFace;
|
||||
import org.bukkit.entity.Item;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
import org.bukkit.util.Vector;
|
||||
|
||||
public class TNTGenerator
|
||||
{
|
||||
private SkyWars Host;
|
||||
|
||||
private Location _loc;
|
||||
|
||||
private long _time;
|
||||
private long _timeDelay = 15000;
|
||||
private Item _ent;
|
||||
|
||||
public TNTGenerator(SkyWars host, Location loc)
|
||||
{
|
||||
Host = host;
|
||||
|
||||
_time = System.currentTimeMillis();
|
||||
|
||||
_loc = loc;
|
||||
|
||||
_loc.getBlock().getRelative(BlockFace.DOWN)
|
||||
.setType(Material.IRON_BLOCK);
|
||||
}
|
||||
|
||||
public void update()
|
||||
{
|
||||
if (_ent != null)
|
||||
{
|
||||
if (!_ent.isValid())
|
||||
{
|
||||
_ent.remove();
|
||||
_ent = null;
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (!UtilTime.elapsed(_time, _timeDelay))
|
||||
return;
|
||||
|
||||
// Spawn
|
||||
_ent = _loc.getWorld().dropItem(_loc.clone().add(0, 1, 0),
|
||||
new ItemStack(Material.TNT));
|
||||
_ent.setVelocity(new Vector(0, 1, 0));
|
||||
|
||||
// Block
|
||||
_loc.getBlock().getRelative(BlockFace.DOWN)
|
||||
.setType(Material.REDSTONE_BLOCK);
|
||||
|
||||
// Firework
|
||||
UtilFirework.playFirework(_loc.clone().add(0, 1, 0), FireworkEffect
|
||||
.builder().flicker(false).withColor(Color.RED).with(Type.BURST)
|
||||
.trail(true).build());
|
||||
}
|
||||
|
||||
public void pickup(Player player, Item item)
|
||||
{
|
||||
if (_ent == null)
|
||||
{
|
||||
_ent.remove();
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_ent.equals(item))
|
||||
return;
|
||||
|
||||
if (!Host.IsAlive(player))
|
||||
return;
|
||||
|
||||
if (Host.Manager.isSpectator(player))
|
||||
return;
|
||||
|
||||
GameTeam team = Host.GetTeam(player);
|
||||
if (team == null)
|
||||
return;
|
||||
|
||||
// Remove
|
||||
_ent.remove();
|
||||
_ent = null;
|
||||
_time = System.currentTimeMillis();
|
||||
_loc.getBlock().getRelative(BlockFace.DOWN)
|
||||
.setType(Material.IRON_BLOCK);
|
||||
|
||||
// Inform
|
||||
UtilPlayer.message(
|
||||
player,
|
||||
F.main("Game", "You collected " + C.cYellow
|
||||
+ "Super Throwing TNT"));
|
||||
|
||||
// Firework
|
||||
UtilFirework.playFirework(_loc.clone().add(0, 1, 0),
|
||||
FireworkEffect.builder().flicker(false).withColor(Color.YELLOW)
|
||||
.with(Type.BALL_LARGE).trail(true).build());
|
||||
|
||||
player.getInventory().addItem(
|
||||
ItemStackFactory.Instance.CreateStack(
|
||||
Material.TNT,
|
||||
(byte) 0,
|
||||
1,
|
||||
F.item(C.cYellow + C.Bold + "Left Click - Far "
|
||||
+ C.cWhite + " / " + C.cYellow + C.Bold
|
||||
+ " Right Click - Short")));
|
||||
|
||||
player.playSound(player.getLocation(), Sound.ENDERDRAGON_HIT, 3F, 1F);
|
||||
|
||||
Bukkit.getPluginManager().callEvent(new TNTPickupEvent(player));
|
||||
}
|
||||
|
||||
public String getScoreboardInfo()
|
||||
{
|
||||
if (_ent != null)
|
||||
return "Lootable";
|
||||
else
|
||||
return UtilTime.MakeStr(_timeDelay - (System.currentTimeMillis() - _time), 0);
|
||||
}
|
||||
|
||||
public boolean active()
|
||||
{
|
||||
return _ent != null;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
package nautilus.game.arcade.game.games.skywars.events;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Zombie;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
public class PlayerKillZombieEvent extends Event
|
||||
{
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
|
||||
public static HandlerList getHandlerList()
|
||||
{
|
||||
return handlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers()
|
||||
{
|
||||
return getHandlerList();
|
||||
}
|
||||
|
||||
private final Player _who;
|
||||
private final Zombie _zombie;
|
||||
|
||||
public PlayerKillZombieEvent(Player who, Zombie zombie)
|
||||
{
|
||||
this._who = who;
|
||||
this._zombie = zombie;
|
||||
|
||||
}
|
||||
|
||||
public Player getWho()
|
||||
{
|
||||
return _who;
|
||||
}
|
||||
|
||||
public Zombie getZombie() {
|
||||
return _zombie;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package nautilus.game.arcade.game.games.skywars.events;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.Event;
|
||||
import org.bukkit.event.HandlerList;
|
||||
|
||||
public class PlayerOpenChestEvent extends Event
|
||||
{
|
||||
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
|
||||
private Player _who;
|
||||
|
||||
public PlayerOpenChestEvent(Player who)
|
||||
{
|
||||
this._who = who;
|
||||
}
|
||||
|
||||
public static HandlerList getHandlerList()
|
||||
{
|
||||
return handlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers()
|
||||
{
|
||||
return getHandlerList();
|
||||
}
|
||||
|
||||
public Player getPlayer() {
|
||||
|
||||
return _who;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,35 @@
|
||||
package nautilus.game.arcade.game.games.skywars.events;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.HandlerList;
|
||||
import org.bukkit.event.player.PlayerEvent;
|
||||
|
||||
public class TNTPickupEvent extends PlayerEvent
|
||||
{
|
||||
private static final HandlerList handlers = new HandlerList();
|
||||
|
||||
public static HandlerList getHandlerList()
|
||||
{
|
||||
return handlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public HandlerList getHandlers()
|
||||
{
|
||||
return getHandlerList();
|
||||
}
|
||||
|
||||
private static Player _who;
|
||||
|
||||
public TNTPickupEvent(Player who)
|
||||
{
|
||||
super(who);
|
||||
_who = who;
|
||||
|
||||
}
|
||||
|
||||
public Player getWho()
|
||||
{
|
||||
return _who;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,42 @@
|
||||
package nautilus.game.arcade.game.games.skywars.kits;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.kit.Kit;
|
||||
import nautilus.game.arcade.kit.KitAvailability;
|
||||
import nautilus.game.arcade.kit.Perk;
|
||||
import nautilus.game.arcade.kit.perks.PerkChicken;
|
||||
|
||||
public class KitChicken extends Kit
|
||||
{
|
||||
|
||||
static PerkChicken p;
|
||||
|
||||
public KitChicken(ArcadeManager manager)
|
||||
{
|
||||
super(manager,
|
||||
"Chicken Farmer",
|
||||
KitAvailability.Free,
|
||||
0,
|
||||
new String[]
|
||||
{
|
||||
"BAWK BAWK. Eggs!"
|
||||
},
|
||||
new Perk[]{p = new PerkChicken(manager)},
|
||||
EntityType.ZOMBIE,
|
||||
new ItemStack(Material.EGG));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void GiveItems(Player player)
|
||||
{
|
||||
p.spawnChicken(player, player.getLocation());
|
||||
|
||||
player.getInventory().addItem(new ItemStack(Material.WOOD_AXE));
|
||||
player.getInventory().addItem(new ItemStack(Material.WOOD_PICKAXE));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,51 @@
|
||||
package nautilus.game.arcade.game.games.skywars.kits;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import mineplex.core.achievement.Achievement;
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.kit.Kit;
|
||||
import nautilus.game.arcade.kit.KitAvailability;
|
||||
import nautilus.game.arcade.kit.Perk;
|
||||
import nautilus.game.arcade.kit.perks.*;
|
||||
|
||||
public class KitDestructor extends Kit
|
||||
{
|
||||
public KitDestructor(ArcadeManager manager)
|
||||
{
|
||||
super(manager, "Destructor", KitAvailability.Achievement,
|
||||
|
||||
new String[]
|
||||
{
|
||||
"Your Ender Pearls make the world crumble!"
|
||||
},
|
||||
|
||||
new Perk[]
|
||||
{
|
||||
new PerkDestructor(40, 2, 2500, true)
|
||||
},
|
||||
EntityType.ZOMBIE,
|
||||
new ItemStack(Material.ENDER_PEARL));
|
||||
|
||||
this.setAchievementRequirements(new Achievement[]
|
||||
{
|
||||
Achievement.SKYWARS_BOMBER,
|
||||
Achievement.SKYWARS_NOARMOR,
|
||||
Achievement.SKYWARS_NOCHEST,
|
||||
Achievement.SKYWARS_PLAYER_KILLS,
|
||||
Achievement.SKYWARS_TNT,
|
||||
Achievement.SKYWARS_WINS,
|
||||
Achievement.SKYWARS_ZOMBIE_KILLS
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
public void GiveItems(Player player)
|
||||
{
|
||||
player.getInventory().addItem(new ItemStack(Material.WOOD_AXE));
|
||||
player.getInventory().addItem(new ItemStack(Material.WOOD_PICKAXE));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package nautilus.game.arcade.game.games.skywars.kits;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.kit.Kit;
|
||||
import nautilus.game.arcade.kit.KitAvailability;
|
||||
import nautilus.game.arcade.kit.Perk;
|
||||
import nautilus.game.arcade.kit.perks.PerkMadScientist;
|
||||
|
||||
public class KitMadScientist extends Kit
|
||||
{
|
||||
|
||||
public KitMadScientist(ArcadeManager manager)
|
||||
{
|
||||
super(manager, "Mad Scientist",
|
||||
KitAvailability.Gem,
|
||||
new String[]{ "Spawn crazy animals to fight for you!" },
|
||||
new Perk[]
|
||||
{
|
||||
new PerkMadScientist(manager) },
|
||||
EntityType.ZOMBIE, new ItemStack(
|
||||
Material.MONSTER_EGG));
|
||||
// TODO Auto-generated constructor stub
|
||||
}
|
||||
|
||||
@Override
|
||||
public void GiveItems(Player player)
|
||||
{
|
||||
player.getInventory().addItem(new ItemStack(Material.WOOD_AXE));
|
||||
player.getInventory().addItem(new ItemStack(Material.WOOD_PICKAXE));
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
package nautilus.game.arcade.game.games.skywars.kits;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.kit.Kit;
|
||||
import nautilus.game.arcade.kit.KitAvailability;
|
||||
import nautilus.game.arcade.kit.Perk;
|
||||
import nautilus.game.arcade.kit.perks.*;
|
||||
|
||||
public class KitMiner extends Kit
|
||||
{
|
||||
public KitMiner(ArcadeManager manager)
|
||||
{
|
||||
super(manager, "Miner", KitAvailability.Gem, 5000,
|
||||
|
||||
new String[]
|
||||
{
|
||||
"Start with better tools!"
|
||||
},
|
||||
|
||||
new Perk[]
|
||||
{
|
||||
new PerkDigger(),
|
||||
},
|
||||
EntityType.ZOMBIE,
|
||||
new ItemStack(Material.IRON_PICKAXE));
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void GiveItems(Player player)
|
||||
{
|
||||
player.getInventory().addItem(new ItemStack(Material.STONE_AXE));
|
||||
player.getInventory().addItem(new ItemStack(Material.IRON_PICKAXE));
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,223 @@
|
||||
package nautilus.game.arcade.kit.perks;
|
||||
|
||||
import java.util.Iterator;
|
||||
|
||||
import mineplex.core.common.util.C;
|
||||
import mineplex.core.common.util.NautHashMap;
|
||||
import mineplex.core.common.util.UtilEnt;
|
||||
import mineplex.core.common.util.UtilTime;
|
||||
import mineplex.core.updater.UpdateType;
|
||||
import mineplex.core.updater.event.UpdateEvent;
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.kit.Perk;
|
||||
import net.minecraft.server.v1_7_R4.EntityCreature;
|
||||
import net.minecraft.server.v1_7_R4.Navigation;
|
||||
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftCreature;
|
||||
import org.bukkit.entity.Chicken;
|
||||
import org.bukkit.entity.Creature;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDeathEvent;
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public class PerkChicken extends Perk
|
||||
{
|
||||
|
||||
private NautHashMap<String, Creature> _activeKitHolders = new NautHashMap<String, Creature>();
|
||||
private NautHashMap<String, Integer> _failedAttempts = new NautHashMap<String, Integer>();
|
||||
|
||||
private long _lastEgg = 0;
|
||||
|
||||
public PerkChicken(ArcadeManager manager)
|
||||
{
|
||||
super("Animal Tamer", new String[]
|
||||
{
|
||||
"Get a chicken that follows you around",
|
||||
"And lays eggs every 15 seconds!"
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
public void spawnChicken(Player player, Location location)
|
||||
{
|
||||
|
||||
if (_activeKitHolders.containsKey(player.getName()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Manager.GetGame().CreatureAllowOverride = true;
|
||||
|
||||
Location loc = player.getLocation();
|
||||
Chicken c = loc.getWorld().spawn(loc.add(0, 1, 0), Chicken.class);
|
||||
c.setRemoveWhenFarAway(false);
|
||||
c.setMaxHealth(35.0D);
|
||||
c.setAdult();
|
||||
|
||||
if (player.getName().toLowerCase().endsWith("s"))
|
||||
{
|
||||
c.setCustomName(C.cAqua + UtilEnt.getName(player) + "' Chicken");
|
||||
}
|
||||
else
|
||||
{
|
||||
c.setCustomName(C.cAqua + UtilEnt.getName(player) + "'s Chicken");
|
||||
}
|
||||
|
||||
c.setCustomNameVisible(true);
|
||||
|
||||
_activeKitHolders.put(player.getName(), c);
|
||||
_failedAttempts.put(player.getName(), 0);
|
||||
|
||||
Manager.GetGame().CreatureAllowOverride = false;
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void chickenFollow(UpdateEvent event)
|
||||
{
|
||||
if (event.getType() != UpdateType.FAST)
|
||||
return;
|
||||
|
||||
int xDiff;
|
||||
int yDiff;
|
||||
int zDiff;
|
||||
|
||||
Iterator<String> ownerIterator = _activeKitHolders.keySet().iterator();
|
||||
|
||||
while (ownerIterator.hasNext())
|
||||
{
|
||||
String playerName = ownerIterator.next();
|
||||
Player owner = Bukkit.getPlayer(playerName);
|
||||
|
||||
Creature chicken = _activeKitHolders.get(playerName);
|
||||
Location chickenSpot = chicken.getLocation();
|
||||
Location ownerSpot = owner.getLocation();
|
||||
xDiff = Math.abs(chickenSpot.getBlockX() - ownerSpot.getBlockX());
|
||||
yDiff = Math.abs(chickenSpot.getBlockY() - ownerSpot.getBlockY());
|
||||
zDiff = Math.abs(chickenSpot.getBlockZ() - ownerSpot.getBlockZ());
|
||||
|
||||
if ((xDiff + yDiff + zDiff) > 4)
|
||||
{
|
||||
EntityCreature ec = ((CraftCreature) chicken).getHandle();
|
||||
Navigation nav = ec.getNavigation();
|
||||
|
||||
int xIndex = -1;
|
||||
int zIndex = -1;
|
||||
Block targetBlock = ownerSpot.getBlock().getRelative(xIndex,
|
||||
-1, zIndex);
|
||||
while (targetBlock.isEmpty() || targetBlock.isLiquid())
|
||||
{
|
||||
if (xIndex < 2)
|
||||
xIndex++;
|
||||
else if (zIndex < 2)
|
||||
{
|
||||
xIndex = -1;
|
||||
zIndex++;
|
||||
}
|
||||
else return;
|
||||
|
||||
targetBlock = ownerSpot.getBlock().getRelative(xIndex, -1,
|
||||
zIndex);
|
||||
}
|
||||
|
||||
float speed = 0.9f;
|
||||
|
||||
if (_failedAttempts.get(playerName) > 4)
|
||||
{
|
||||
chicken.teleport(owner);
|
||||
_failedAttempts.put(playerName, 0);
|
||||
}
|
||||
else if (!nav.a(targetBlock.getX(), targetBlock.getY() + 1,
|
||||
targetBlock.getZ(), speed))
|
||||
{
|
||||
if (chicken.getFallDistance() == 0)
|
||||
{
|
||||
_failedAttempts.put(playerName,
|
||||
_failedAttempts.get(playerName) + 1);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
_failedAttempts.put(playerName, 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void dropEggs(UpdateEvent e)
|
||||
{
|
||||
if (e.getType() != UpdateType.FAST)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!UtilTime.elapsed(_lastEgg, 8000))
|
||||
return;
|
||||
|
||||
_lastEgg = System.currentTimeMillis();
|
||||
|
||||
Iterator<String> ownerIterator = _activeKitHolders.keySet().iterator();
|
||||
|
||||
while (ownerIterator.hasNext())
|
||||
{
|
||||
String playerName = ownerIterator.next();
|
||||
Player owner = Bukkit.getPlayer(playerName);
|
||||
|
||||
Creature chicken = _activeKitHolders.get(playerName);
|
||||
Location chickenSpot = chicken.getLocation();
|
||||
|
||||
Bukkit.getWorld(owner.getWorld().getName())
|
||||
.dropItemNaturally(chickenSpot, new ItemStack(Material.EGG))
|
||||
.setPickupDelay(30);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onChickenDeath(EntityDeathEvent e)
|
||||
{
|
||||
|
||||
if (!(e.getEntity() instanceof Chicken))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Creature chicken = (Creature) e.getEntity();
|
||||
|
||||
Iterator<String> ownerIterator = _activeKitHolders.keySet().iterator();
|
||||
|
||||
while (ownerIterator.hasNext())
|
||||
{
|
||||
String playerName = ownerIterator.next();
|
||||
|
||||
if (_activeKitHolders.get(playerName).equals(chicken))
|
||||
{
|
||||
ownerIterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onOwnerDeath(PlayerDeathEvent e)
|
||||
{
|
||||
|
||||
String playerName = e.getEntity().getName();
|
||||
|
||||
if (_activeKitHolders.containsKey(playerName))
|
||||
{
|
||||
Creature chicken = _activeKitHolders.get(playerName);
|
||||
chicken.remove();
|
||||
System.out.println("Chicken removed due to owner death");
|
||||
_activeKitHolders.remove(playerName);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -24,24 +24,29 @@ import java.util.*;
|
||||
|
||||
public class PerkDestructor extends Perk
|
||||
{
|
||||
private boolean _enabled = false;
|
||||
private boolean _enabled;
|
||||
|
||||
private int _spawnRate;
|
||||
private int _max;
|
||||
|
||||
private long _fallTime;
|
||||
|
||||
private HashMap<Block, Long> _blocks = new HashMap<Block, Long>();
|
||||
|
||||
public PerkDestructor(int spawnRate, int max)
|
||||
public PerkDestructor(int spawnRate, int max, long fallTime, boolean enabled)
|
||||
{
|
||||
super("Seismic Charge", new String[]
|
||||
{
|
||||
C.cGray + "Receive 1 Seismic Charge every " + spawnRate + " seconds. Maximum of " + max + ".",
|
||||
C.cYellow + "Right-Click" + C.cGray + " with Seismic Charge to " + C.cGreen + "Throw Seismic Charge",
|
||||
C.cGray + "You will not receive them until bridges drop",
|
||||
enabled ? "" : C.cGray + "You will not receive them until bridges drop",
|
||||
});
|
||||
|
||||
_spawnRate = spawnRate;
|
||||
_max = max;
|
||||
_fallTime = fallTime;
|
||||
|
||||
_enabled = enabled;
|
||||
}
|
||||
|
||||
public void Apply(Player player)
|
||||
@ -135,6 +140,9 @@ public class PerkDestructor extends Perk
|
||||
if (event.getCause() != TeleportCause.ENDER_PEARL)
|
||||
return;
|
||||
|
||||
if (!Kit.HasKit(event.getPlayer()))
|
||||
return;
|
||||
|
||||
for (Block block : UtilBlock.getInRadius(event.getTo(), 4).keySet())
|
||||
{
|
||||
if (block.getType() == Material.AIR || block.getType() == Material.BEDROCK || block.isLiquid())
|
||||
@ -172,7 +180,7 @@ public class PerkDestructor extends Perk
|
||||
|
||||
for (Block block : _blocks.keySet())
|
||||
{
|
||||
if (!UtilTime.elapsed(_blocks.get(block), 400))
|
||||
if (!UtilTime.elapsed(_blocks.get(block), _fallTime))
|
||||
continue;
|
||||
|
||||
if (lowest == null || block.getY() < lowestY)
|
||||
@ -198,23 +206,6 @@ public class PerkDestructor extends Perk
|
||||
_blocks.remove(lowest);
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void PaintballDamage(CustomDamageEvent event)
|
||||
{
|
||||
if (Manager.GetGame() == null || !Manager.GetGame().IsLive())
|
||||
return;
|
||||
|
||||
if (event.GetProjectile() == null)
|
||||
return;
|
||||
|
||||
if (!(event.GetProjectile() instanceof EnderPearl))
|
||||
return;
|
||||
|
||||
event.AddMod(GetName(), GetName(), 4, true);
|
||||
|
||||
event.AddKnockback(GetName(), 2.5);
|
||||
}
|
||||
|
||||
public void setEnabled(boolean var)
|
||||
{
|
||||
|
||||
@ -0,0 +1,287 @@
|
||||
package nautilus.game.arcade.kit.perks;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import mineplex.core.common.util.C;
|
||||
import mineplex.core.common.util.NautHashMap;
|
||||
import mineplex.core.common.util.UtilAction;
|
||||
import mineplex.core.common.util.UtilEnt;
|
||||
import mineplex.core.common.util.UtilInv;
|
||||
import mineplex.core.common.util.UtilMath;
|
||||
import mineplex.core.common.util.UtilParticle;
|
||||
import mineplex.core.common.util.UtilParticle.ParticleType;
|
||||
import mineplex.core.common.util.UtilParticle.ViewDist;
|
||||
import mineplex.core.common.util.UtilServer;
|
||||
import mineplex.core.disguise.disguises.DisguiseBase;
|
||||
import mineplex.core.disguise.disguises.DisguiseBlaze;
|
||||
import mineplex.core.disguise.disguises.DisguiseCow;
|
||||
import mineplex.core.disguise.disguises.DisguiseInsentient;
|
||||
import mineplex.core.disguise.disguises.DisguisePig;
|
||||
import mineplex.core.disguise.disguises.DisguisePigZombie;
|
||||
import mineplex.core.disguise.disguises.DisguiseSkeleton;
|
||||
import mineplex.core.disguise.disguises.DisguiseSlime;
|
||||
import mineplex.core.disguise.disguises.DisguiseSpider;
|
||||
import mineplex.core.disguise.disguises.DisguiseZombie;
|
||||
import mineplex.core.itemstack.ItemStackFactory;
|
||||
import mineplex.core.projectile.IThrown;
|
||||
import mineplex.core.projectile.ProjectileUser;
|
||||
import mineplex.core.recharge.Recharge;
|
||||
import mineplex.core.updater.UpdateType;
|
||||
import mineplex.core.updater.event.UpdateEvent;
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.kit.Perk;
|
||||
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.block.Block;
|
||||
import org.bukkit.entity.Cow;
|
||||
import org.bukkit.entity.Creature;
|
||||
import org.bukkit.entity.LivingEntity;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Zombie;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
|
||||
import org.bukkit.event.entity.EntityTargetLivingEntityEvent;
|
||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||
import org.bukkit.event.player.PlayerInteractEvent;
|
||||
|
||||
public class PerkMadScientist extends Perk implements IThrown
|
||||
{
|
||||
|
||||
private NautHashMap<String, Creature> _activeKitHolders = new NautHashMap<String, Creature>();
|
||||
|
||||
public PerkMadScientist(ArcadeManager manager)
|
||||
{
|
||||
super("Mad Scientist", new String[]
|
||||
{
|
||||
"Recieve 1 throwable egg 90 seconds! (Max 3)",
|
||||
"Eggs spawn a loyal minion to fight with you",
|
||||
});
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void eggSpawn(UpdateEvent event)
|
||||
{
|
||||
if (event.getType() != UpdateType.FAST)
|
||||
return;
|
||||
|
||||
if (Manager.GetGame() == null)
|
||||
return;
|
||||
|
||||
for (Player player : Manager.GetGame().GetPlayers(true))
|
||||
{
|
||||
if (!Kit.HasKit(player))
|
||||
continue;
|
||||
|
||||
if (!Manager.GetGame().IsAlive(player))
|
||||
continue;
|
||||
|
||||
if(UtilInv.contains(player, Material.MONSTER_EGG, (byte) 0, 3)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!Recharge.Instance.use(player, "Egg Spawn", 90000, false, false))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
player.getInventory().addItem(
|
||||
ItemStackFactory.Instance.CreateStack(
|
||||
Material.MONSTER_EGG, (byte) 0, 1, C.cYellow
|
||||
+ C.Bold + "Click To Throw",
|
||||
Arrays.asList("")));
|
||||
player.playSound(player.getLocation(), Sound.ITEM_PICKUP, 2f,
|
||||
1f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void throwEgg(PlayerInteractEvent e)
|
||||
{
|
||||
|
||||
Player player = e.getPlayer();
|
||||
|
||||
if (player.getItemInHand().getType() != Material.MONSTER_EGG)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!Kit.HasKit(player))
|
||||
return;
|
||||
|
||||
e.setCancelled(true);
|
||||
|
||||
org.bukkit.entity.Item ent = player.getWorld().dropItem(
|
||||
player.getEyeLocation(),
|
||||
ItemStackFactory.Instance.CreateStack(player.getItemInHand()
|
||||
.getType()));
|
||||
UtilAction.velocity(ent, player.getLocation().getDirection(), 1.5,
|
||||
false, 0, 0.2, 10, false);
|
||||
|
||||
Manager.GetProjectile().AddThrow(ent, player, this, -1, true, true,
|
||||
true, false, 0.6f);
|
||||
|
||||
UtilInv.remove(player, Material.MONSTER_EGG, (byte) 0, 1);
|
||||
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void onTargetzombie(EntityTargetLivingEntityEvent e)
|
||||
{
|
||||
|
||||
if (!(e.getEntity() instanceof Zombie))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(e.getTarget() instanceof Player))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Zombie zombie = (Zombie) e.getEntity();
|
||||
Player targetPlayer = (Player) e.getTarget();
|
||||
|
||||
String name = ChatColor
|
||||
.stripColor(zombie.getCustomName().split("'")[0]);
|
||||
|
||||
if (targetPlayer.getName().equalsIgnoreCase(name))
|
||||
{
|
||||
e.setCancelled(true);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void onOwnerDeath(PlayerDeathEvent e)
|
||||
{
|
||||
|
||||
String playerName = e.getEntity().getName();
|
||||
|
||||
if (_activeKitHolders.containsKey(playerName))
|
||||
{
|
||||
Creature zombie = _activeKitHolders.get(playerName);
|
||||
zombie.remove();
|
||||
System.out.println("Chicken removed due to owner death");
|
||||
_activeKitHolders.remove(playerName);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void Collide(LivingEntity target, Block block, ProjectileUser data)
|
||||
{
|
||||
|
||||
if (target != null)
|
||||
{
|
||||
Manager.GetDamage().NewDamageEvent(target, data.GetThrower(), null,
|
||||
DamageCause.CUSTOM, 1.5D, true, false, false,
|
||||
UtilEnt.getName(data.GetThrower()), GetName());
|
||||
|
||||
}
|
||||
|
||||
spawnMobs(data);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void Idle(ProjectileUser data)
|
||||
{
|
||||
spawnMobs(data);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void Expire(ProjectileUser data)
|
||||
{
|
||||
|
||||
spawnMobs(data);
|
||||
}
|
||||
|
||||
public void spawnMobs(ProjectileUser data)
|
||||
{
|
||||
data.GetThrown()
|
||||
.getWorld()
|
||||
.playSound(data.GetThrown().getLocation(), Sound.EXPLODE, 1f,
|
||||
1.6f);
|
||||
|
||||
UtilParticle.PlayParticle(ParticleType.EXPLODE, data.GetThrown()
|
||||
.getLocation(), 0F, 0F, 0F, 1F, 5, ViewDist.SHORT, UtilServer
|
||||
.getPlayers());
|
||||
|
||||
data.GetThrown().remove();
|
||||
|
||||
int amount = 1;
|
||||
|
||||
Manager.GetGame().CreatureAllowOverride = true;
|
||||
|
||||
Zombie zombie = (Zombie) data.GetThrown().getWorld()
|
||||
.spawn(data.GetThrown().getLocation(), Zombie.class);
|
||||
zombie.setRemoveWhenFarAway(false);
|
||||
zombie.setMaxHealth(10.0D);
|
||||
zombie.setHealth(10.0D);
|
||||
UtilEnt.silence(zombie, true);
|
||||
|
||||
//Name
|
||||
if (((Player) data.GetThrower()).getName().toLowerCase()
|
||||
.endsWith("s"))
|
||||
{
|
||||
zombie.setCustomName(C.cAqua + UtilEnt.getName(data.GetThrower())
|
||||
+ "' Minion");
|
||||
}
|
||||
else
|
||||
{
|
||||
zombie.setCustomName(C.cAqua + UtilEnt.getName(data.GetThrower())
|
||||
+ "'s Minion");
|
||||
}
|
||||
|
||||
double r = Math.random();
|
||||
|
||||
DisguiseBase disguise;
|
||||
if (r > 0.8)
|
||||
{
|
||||
disguise = new DisguiseZombie(zombie);
|
||||
}
|
||||
else if (r > 0.6)
|
||||
{
|
||||
disguise = new DisguiseBlaze(zombie);
|
||||
}
|
||||
else if (r > 0.4)
|
||||
{
|
||||
disguise = new DisguiseSpider(zombie);
|
||||
}
|
||||
else if (r > 0.2)
|
||||
{
|
||||
disguise = new DisguiseSkeleton(zombie);
|
||||
}
|
||||
else
|
||||
{
|
||||
disguise = new DisguiseSlime(zombie);
|
||||
((DisguiseSlime)disguise).SetSize(2);
|
||||
}
|
||||
|
||||
if (disguise instanceof DisguiseInsentient)
|
||||
{
|
||||
if (((Player) data.GetThrower()).getName().toLowerCase().endsWith("s"))
|
||||
{
|
||||
((DisguiseInsentient)disguise).setName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "' Minion");
|
||||
}
|
||||
else
|
||||
{
|
||||
((DisguiseInsentient)disguise).setName(C.cAqua + UtilEnt.getName(data.GetThrower()) + "' Minion");
|
||||
}
|
||||
|
||||
((DisguiseInsentient)disguise).setCustomNameVisible(true);
|
||||
}
|
||||
|
||||
Manager.GetDisguise().disguise(disguise);
|
||||
|
||||
Manager.GetGame().CreatureAllowOverride = false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@ -40,7 +40,8 @@ public class GameStatManager implements Listener
|
||||
if (event.GetState() != GameState.Live)
|
||||
return;
|
||||
|
||||
int requirement = (int)((double)event.GetGame().Manager.GetPlayerFull() * 0.75d);
|
||||
//int requirement = (int)((double)event.GetGame().Manager.GetPlayerFull() * 0.75d);
|
||||
int requirement = 2;
|
||||
|
||||
event.GetGame().CanAddStats = (double)event.GetGame().GetPlayers(true).size() >= requirement;
|
||||
|
||||
|
||||
@ -1,7 +1,9 @@
|
||||
package nautilus.game.arcade.ore;
|
||||
|
||||
import mineplex.core.common.util.MapUtil;
|
||||
import mineplex.core.common.util.NautHashMap;
|
||||
import mineplex.core.common.util.UtilBlock;
|
||||
import mineplex.core.common.util.UtilWorld;
|
||||
import mineplex.core.explosion.ExplosionEvent;
|
||||
|
||||
import org.bukkit.Location;
|
||||
@ -29,7 +31,7 @@ public class OreHider
|
||||
|
||||
if (visible)
|
||||
{
|
||||
loc.getBlock().setType(type);
|
||||
MapUtil.QuickChangeBlockAt(loc, type);
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -43,7 +45,7 @@ public class OreHider
|
||||
{
|
||||
if (_hidden.containsKey(block.getLocation()))
|
||||
{
|
||||
block.setType(_hidden.remove(block.getLocation()));
|
||||
MapUtil.QuickChangeBlockAt(block.getLocation(), _hidden.remove(block.getLocation()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -15,11 +15,14 @@ import nautilus.game.arcade.game.Game;
|
||||
|
||||
public class DeathBomberStatTracker extends StatTracker<Game>
|
||||
{
|
||||
private int _required;
|
||||
private final Map<UUID, Integer> _killCount = new HashMap<>();
|
||||
|
||||
public DeathBomberStatTracker(Game game)
|
||||
public DeathBomberStatTracker(Game game, int requiredKills)
|
||||
{
|
||||
super(game);
|
||||
|
||||
_required = requiredKills;
|
||||
}
|
||||
|
||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
|
||||
@ -54,7 +57,7 @@ public class DeathBomberStatTracker extends StatTracker<Game>
|
||||
|
||||
_killCount.put(killer.getUniqueId(), count);
|
||||
|
||||
if (count >= 5)
|
||||
if (count >= _required)
|
||||
addStat(killer, "DeathBomber", 1, true, false);
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
package nautilus.game.arcade.stats;
|
||||
|
||||
import nautilus.game.arcade.game.Game;
|
||||
import nautilus.game.arcade.game.games.skywars.events.PlayerKillZombieEvent;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.entity.Zombie;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
|
||||
public class SkyWarsKillZombieStatTracker extends StatTracker<Game>
|
||||
{
|
||||
|
||||
public SkyWarsKillZombieStatTracker(Game game)
|
||||
{
|
||||
super(game);
|
||||
}
|
||||
|
||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
|
||||
public void onKillZombie(PlayerKillZombieEvent event)
|
||||
{
|
||||
if (getGame().GetState() != Game.GameState.Live)
|
||||
return;
|
||||
|
||||
if (!(event.getWho() instanceof Player))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(event.getZombie() instanceof Zombie))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
addStat(event.getWho(), "ZombieKills", 1, false, false);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
package nautilus.game.arcade.stats;
|
||||
|
||||
import nautilus.game.arcade.game.Game;
|
||||
import nautilus.game.arcade.game.games.skywars.events.TNTKillEvent;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
|
||||
public class SkyWarsTNTKillStatTracker extends StatTracker<Game>
|
||||
{
|
||||
|
||||
public SkyWarsTNTKillStatTracker(Game game)
|
||||
{
|
||||
super(game);
|
||||
}
|
||||
|
||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
|
||||
public void onTNTPickup(TNTKillEvent event)
|
||||
{
|
||||
if (getGame().GetState() != Game.GameState.Live)
|
||||
return;
|
||||
|
||||
if (!(event.getKiller() instanceof Player))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!(event.getVictim() instanceof Player))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
addStat(event.getKiller(), "BombKills", 1, false, false);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
package nautilus.game.arcade.stats;
|
||||
|
||||
import nautilus.game.arcade.game.Game;
|
||||
import nautilus.game.arcade.game.games.skywars.events.TNTPickupEvent;
|
||||
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
|
||||
public class SkyWarsTNTStatTracker extends StatTracker<Game>
|
||||
{
|
||||
|
||||
public SkyWarsTNTStatTracker(Game game)
|
||||
{
|
||||
super(game);
|
||||
}
|
||||
|
||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
|
||||
public void onTNTPickup(TNTPickupEvent event)
|
||||
{
|
||||
if (getGame().GetState() != Game.GameState.Live)
|
||||
return;
|
||||
|
||||
addStat(event.getWho(), "BombPickups", 1, false, false);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package nautilus.game.arcade.stats;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
import nautilus.game.arcade.events.GameStateChangeEvent;
|
||||
import nautilus.game.arcade.game.Game;
|
||||
import nautilus.game.arcade.game.games.skywars.events.PlayerOpenChestEvent;
|
||||
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
|
||||
public class WinWithoutOpeningChestStatTracker extends StatTracker<Game>
|
||||
{
|
||||
|
||||
private final Set<UUID> _openChest = new HashSet<>();
|
||||
|
||||
public WinWithoutOpeningChestStatTracker(Game game)
|
||||
{
|
||||
super(game);
|
||||
}
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void onOpenChest(PlayerOpenChestEvent e) {
|
||||
|
||||
Player player = e.getPlayer();
|
||||
UUID uuid = player.getUniqueId();
|
||||
|
||||
_openChest.add(uuid);
|
||||
|
||||
}
|
||||
|
||||
@EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR)
|
||||
public void onGameStateChange(GameStateChangeEvent event)
|
||||
{
|
||||
if (event.GetState() == Game.GameState.End)
|
||||
{
|
||||
List<Player> winners = getGame().getWinners();
|
||||
|
||||
if (winners != null)
|
||||
{
|
||||
for (Player winner : winners)
|
||||
{
|
||||
if (!_openChest.contains(winner.getUniqueId()))
|
||||
addStat(winner, "NoChest", 1, true, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -10,16 +10,6 @@
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
|
||||
<triggers>auto,full,incremental,</triggers>
|
||||
<arguments>
|
||||
<dictionary>
|
||||
<key>LaunchConfigHandle</key>
|
||||
<value><project>/.externalToolBuilders/CaptureThePig.launch</value>
|
||||
</dictionary>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
|
||||
@ -2,11 +2,10 @@
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core.CraftBukkit"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.Core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
|
||||
<classpathentry kind="var" path="REPO_DIR"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
||||
@ -5,24 +5,19 @@ import java.io.FileFilter;
|
||||
import java.io.IOException;
|
||||
|
||||
import mineplex.core.account.CoreClientManager;
|
||||
import mineplex.core.antistack.AntiStack;
|
||||
import mineplex.core.blockrestore.BlockRestore;
|
||||
import mineplex.core.command.CommandCenter;
|
||||
import mineplex.core.common.CurrencyType;
|
||||
import mineplex.core.creature.Creature;
|
||||
import mineplex.core.donation.DonationManager;
|
||||
import mineplex.core.explosion.Explosion;
|
||||
import mineplex.core.fakeEntity.FakeEntity;
|
||||
import mineplex.core.fakeEntity.FakeEntityManager;
|
||||
import mineplex.core.itemstack.ItemStackFactory;
|
||||
import mineplex.core.join.JoinQuit;
|
||||
import mineplex.core.memory.MemoryFix;
|
||||
import mineplex.core.monitor.LagMeter;
|
||||
import mineplex.core.npc.NpcManager;
|
||||
import mineplex.core.packethandler.PacketHandler;
|
||||
import mineplex.core.punish.Punish;
|
||||
import mineplex.core.recharge.Recharge;
|
||||
import mineplex.core.server.ServerListener;
|
||||
import mineplex.core.spawn.Spawn;
|
||||
import mineplex.core.status.ServerStatusManager;
|
||||
import mineplex.core.teleport.Teleport;
|
||||
@ -34,14 +29,13 @@ import nautilus.game.minekart.repository.KartRepository;
|
||||
import nautilus.game.minekart.shop.KartShop;
|
||||
import nautilus.game.minekart.track.TrackManager;
|
||||
import nautilus.game.minekart.track.TrackProcessor;
|
||||
import nautilus.minecraft.core.INautilusPlugin;
|
||||
import net.minecraft.server.v1_7_R1.EntityPlayer;
|
||||
import net.minecraft.server.v1_7_R4.EntityPlayer;
|
||||
import net.minecraft.util.org.apache.commons.io.FileDeleteStrategy;
|
||||
|
||||
import org.apache.commons.io.FileDeleteStrategy;
|
||||
import org.bukkit.GameMode;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.Server;
|
||||
import org.bukkit.craftbukkit.v1_7_R1.entity.CraftPlayer;
|
||||
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftPlayer;
|
||||
import org.bukkit.entity.EntityType;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
@ -58,6 +52,8 @@ import org.bukkit.event.player.PlayerDropItemEvent;
|
||||
import org.bukkit.event.player.PlayerJoinEvent;
|
||||
import org.bukkit.plugin.PluginManager;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
|
||||
|
||||
public class MineKart extends JavaPlugin implements INautilusPlugin, Listener
|
||||
{
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar" sourcepath="/REPO_DIR/GitHubLibraries/CraftBukkit/src"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core"/>
|
||||
|
||||
@ -2,14 +2,12 @@ package nautilus.game.pvp.repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
|
||||
|
||||
import mineplex.core.server.RemoteRepository;
|
||||
import mineplex.core.server.remotecall.AsyncJsonWebCall;
|
||||
import mineplex.core.server.remotecall.JsonWebCall;
|
||||
import nautilus.game.pvp.modules.Fishing.Fish;
|
||||
import nautilus.game.pvp.modules.Fishing.FishData;
|
||||
import nautilus.minecraft.core.webserver.token.Account.FishToken;
|
||||
|
||||
import org.bukkit.craftbukkit.libs.com.google.gson.reflect.TypeToken;
|
||||
|
||||
public class PvPRepository extends RemoteRepository
|
||||
{
|
||||
|
||||
@ -5,7 +5,6 @@
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/bukkit.jar"/>
|
||||
<classpathentry kind="var" path="REPO_DIR/Plugins/Libraries/craftbukkit.jar"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Nautilus.Core"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Minecraft.Game.ClassCombat"/>
|
||||
<classpathentry combineaccessrules="false" kind="src" path="/Mineplex.Core.Common"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user