Started adding SkyWars game mechanics

Plugins/.idea/misc.xml

@@ -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>

Plugins/Mineplex.BungeeRotator/src/biz/neustar/ultra/client/UltraAPIException.java

@@ -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

Plugins/Mineplex.Core/src/mineplex/core/donation/command/CoinCommand.java

@@ -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

Plugins/Mineplex.Core/src/mineplex/core/donation/command/GoldCommand.java

@@ -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)

Plugins/Mineplex.Core/src/mineplex/core/memory/MemoryFix.java

@@ -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;

Plugins/Mineplex.Core/src/mineplex/core/punish/Category.java

@@ -10,6 +10,8 @@ public enum Category
 	PermMute,
 	Other; // Represents perm ban - (or old perm mutes)
 	
+	//test
+	
     public static boolean contains(String s) 
     {
         try 

Plugins/Mineplex.DDoSProtectionSwitcher/.classpath

@@ -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>

Plugins/Mineplex.EnjinTranslator/.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>

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/Farming.java

@@ -41,6 +41,7 @@ public class Farming extends MiniPlugin
 					ItemStackFactory.Instance.CreateStack(Material.GOLDEN_APPLE));
 	}
 
+	@SuppressWarnings("deprecation")
 	@EventHandler
 	public void BlockPlace(BlockPlaceEvent event)
 	{

Plugins/Mineplex.Minecraft.BungeeSigns/.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 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>

Plugins/Mineplex.PlayerCache/.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>

Plugins/Mineplex.StaffServer/.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>

Plugins/Mineplex.StaffServer/src/mineplex/staffServer/StaffServer.java

@@ -6,8 +6,6 @@ import mineplex.core.account.CoreClientManager;
 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;
@@ -23,7 +21,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;

Plugins/Mineplex.StaffServer/src/mineplex/staffServer/customerSupport/CustomerSupport.java

@@ -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;

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

@@ -877,8 +877,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();
 

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

@@ -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),
+	Skywars(SkyWars.class, "SkyWars", Material.CHEST, (byte)0, GameCategory.SURVIVAL, 52),
 	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),

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SkyWars.java

@@ -0,0 +1,162 @@
+package nautilus.game.arcade.game.games.skywars;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.block.BlockPlaceEvent;
+
+import mineplex.core.common.util.UtilBlock;
+import mineplex.core.common.util.UtilMath;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
+import nautilus.game.arcade.ArcadeManager;
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.events.GameStateChangeEvent;
+import nautilus.game.arcade.game.SoloGame;
+import nautilus.game.arcade.kit.Kit;
+
+public class SkyWars extends SoloGame {
+
+	
+
+	private ArrayList<Block> _blocks = new ArrayList<Block>();
+	
+	public SkyWars(ArcadeManager manager) {
+		super(manager, GameType.Skywars, new Kit[] {}, new String[] {
+				"Battle in the sky!",
+				"Collect loot from chests to get better armor",
+				"Last player alive wins!" });
+		
+		PrepareFreeze = false;
+		
+		StrictAntiHack = true;
+
+		GameTimeout = 1500000;
+
+		QuitDropItems = true;
+
+		WorldTimeSet = 0;
+		WorldBoundaryKill = false;
+
+		SpawnDistanceRequirement = 48;
+
+		DamageSelf = true;
+		DamageTeamSelf = true;
+
+		DeathDropItems = true;
+
+		ItemDrop = true;
+		ItemPickup = true;
+
+		InventoryClick = true;
+		InventoryOpenBlock = true;
+		InventoryOpenChest = true;
+
+		PlaySoundGameStart = false;
+		PrepareTime = 15000;
+		
+		VersionRequire1_8 = true;
+		
+		_help = new String[]
+				{
+				"This game is still under heavy development!",
+				"Don't walk near the edge... You can get knocked off!",
+				"Access the TNT generator at mid to fire TNT!"
+				};
+		
+	}
+
+	
+	@SuppressWarnings("deprecation")
+	@EventHandler
+	public void CreateRandomChests(GameStateChangeEvent event)
+	{
+		if (event.GetState() != GameState.Recruit)
+			return;
+
+		HashSet<Material> ignore = new HashSet<Material>();
+
+		ignore.add(Material.LEAVES);
+
+		int xDiff = WorldData.MaxX - WorldData.MinX;
+		int zDiff = WorldData.MaxZ - WorldData.MinZ;
+
+		int done = 0;
+
+		while (done < 40)
+		{
+
+			Block block = UtilBlock.getHighest(WorldData.World, WorldData.MinX + UtilMath.r(xDiff),
+					WorldData.MinZ + UtilMath.r(zDiff), ignore);
+
+			if (!UtilBlock.airFoliage(block) || !UtilBlock.solid(block.getRelative(BlockFace.DOWN)))
+				continue;
+
+			block.setTypeIdAndData(Material.CHEST.getId(), (byte) UtilMath.r(4), true);
+			done++;
+		}
+	}
+	
+	@EventHandler
+	public void BlockPlace(BlockPlaceEvent event)
+	{
+		if (event.isCancelled())
+			return;
+		
+		_blocks.add(event.getBlock());
+	}
+	
+	@SuppressWarnings("deprecation")
+	@EventHandler
+	public void BlockUpdate(UpdateEvent event)
+	{
+		if (event.getType() != UpdateType.TICK)
+			return;
+		
+		if (!IsLive())
+			return;
+		
+		if (_blocks.isEmpty())
+			return;
+		
+		//TimingManager.start("Block Fall");
+		
+		for (int i = 0 ; i < 3 ; i++)
+		{
+			Block bestBlock = null;
+			double bestDist = 0;
+			
+			for (Block block : _blocks)
+			{
+				double dist = UtilMath.offset2d(GetSpectatorLocation(), block.getLocation().add(0.5, 0.5, 0.5));
+				
+				if (bestBlock == null || dist > bestDist)
+				{
+					bestBlock = block;
+					bestDist = dist;
+				}
+			}
+			
+			//Shuffle Down
+			while (bestBlock.getRelative(BlockFace.DOWN).getType() != Material.AIR)
+				bestBlock = bestBlock.getRelative(BlockFace.DOWN);				
+			
+			_blocks.remove(bestBlock);
+			
+			if (bestBlock.getType() != Material.AIR)
+			{
+				if (Math.random() > 0.75)
+					bestBlock.getWorld().spawnFallingBlock(bestBlock.getLocation().add(0.5, 0.5, 0.5), bestBlock.getType(), bestBlock.getData());
+				
+				bestBlock.setType(Material.AIR);
+			}
+		}
+
+		//TimingManager.stop("Block Fall");
+	}
+	
+}

Plugins/Nautilus.Game.CaptureThePig/.project

@@ -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>&lt;project&gt;/.externalToolBuilders/CaptureThePig.launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>

Plugins/Nautilus.Game.MineKart/.classpath

@@ -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>

Plugins/Nautilus.Game.MineKart/src/nautilus/game/minekart/MineKart.java

@@ -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
 {

Plugins/Nautilus.Game.PvP/.classpath

@@ -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"/>

Plugins/Nautilus.Game.PvP/src/nautilus/game/pvp/repository/PvPRepository.java

@@ -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
 {

Plugins/Nautilus.Game.Tutorial/.classpath

@@ -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"/>