Setup new module for intellij, fix field ore

Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml

@@ -19,6 +19,7 @@
       <element id="module-output" name="Mineplex.ServerData" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
       <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
+      <element id="module-output" name="Mineplex.Game.Clans.Core" />
     </root>
   </artifact>
 </component>

Plugins/.idea/modules.xml

@@ -9,6 +9,7 @@
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Core.Common/Mineplex.Core.Common.iml" filepath="$PROJECT_DIR$/Mineplex.Core.Common/Mineplex.Core.Common.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Database/Mineplex.Database.iml" filepath="$PROJECT_DIR$/Mineplex.Database/Mineplex.Database.iml" group="Core" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Game.Clans/Mineplex.Game.Clans.iml" filepath="$PROJECT_DIR$/Mineplex.Game.Clans/Mineplex.Game.Clans.iml" group="Game" />
+      <module fileurl="file://$PROJECT_DIR$/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Hub/Mineplex.Hub.iml" filepath="$PROJECT_DIR$/Mineplex.Hub/Mineplex.Hub.iml" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.MapParser/Mineplex.MapParser.iml" filepath="$PROJECT_DIR$/Mineplex.MapParser/Mineplex.MapParser.iml" />
       <module fileurl="file://$PROJECT_DIR$/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml" filepath="$PROJECT_DIR$/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml" group="Game" />

Plugins/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="Mineplex.ServerData" />
+    <orderEntry type="module" module-name="Mineplex.Core.Common" />
+    <orderEntry type="module" module-name="Mineplex.Core" />
+    <orderEntry type="module" module-name="Mineplex.Database" />
+    <orderEntry type="library" name="craftbukkit" level="project" />
+    <orderEntry type="library" name="jooq" level="project" />
+  </component>
+</module>

Plugins/Mineplex.Game.Clans/Mineplex.Game.Clans.iml

@@ -10,6 +10,7 @@
     <orderEntry type="module" module-name="Mineplex.Core.Common" />
     <orderEntry type="module" module-name="Mineplex.Minecraft.Game.ClassCombat" />
     <orderEntry type="module" module-name="Mineplex.Minecraft.Game.Core" />
+    <orderEntry type="module" module-name="Mineplex.Game.Clans.Core" />
     <orderEntry type="module" module-name="Mineplex.ServerData" />
     <orderEntry type="library" name="craftbukkit" level="project" />
     <orderEntry type="module" module-name="Mineplex.Database" />

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

@@ -769,11 +769,11 @@ public class ClansManager extends MiniClientPlugin<ClientClan> implements IRelat
 	public void onJoin(PlayerLoginEvent event)
 	{
 		Rank rank = _clientManager.Get(event.getPlayer()).GetRank();
-		if (!rank.Has(Rank.MAPDEV) && !event.getPlayer().isWhitelisted())
+		if (!rank.Has(Rank.DEVELOPER)/* && !event.getPlayer().isWhitelisted()*/)
 		{
 			event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
 //			event.setKickMessage("This server is whitelisted!");
-			event.setKickMessage("Only Builder+ can join this server");
+			event.setKickMessage("Only Dev+ can join this server");
 		}
 	}
 }

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOre.java

@@ -243,9 +243,9 @@ public class FieldOre extends MiniPlugin
 		return _oreInactive;
 	}
 	
-	public Set<Location> GetLocations()
+	public HashMap<Location, String> getLocationMap()
 	{
-		return _oreLocations.keySet();
+		return _oreLocations;
 	}
 	
 	public void load()

Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/fields/FieldOreData.java

@@ -31,7 +31,7 @@ public class FieldOreData
 		_loc = loc;
 		_server = server;
 		
-		Field.GetLocations().add(_loc);
+		Field.getLocationMap().put(_loc, server);
 
 		for (FieldOreData other : Field.GetInactive())
 		{
@@ -194,7 +194,7 @@ public class FieldOreData
 		for (FieldOreData other : _neighbours)
 			other.RemoveNeighbour(this);
 		
-		Field.GetLocations().remove(_loc);
+		Field.getLocationMap().remove(_loc);
 
 		_neighbours.clear();
 		_neighbours = null;

Plugins/Mineplex.Hub/Mineplex.Hub.iml

@@ -21,5 +21,6 @@
     <orderEntry type="module" module-name="Mineplex.Database" />
     <orderEntry type="library" name="jooq" level="project" />
     <orderEntry type="library" name="jedis" level="project" />
+    <orderEntry type="module" module-name="Mineplex.Game.Clans.Core" />
   </component>
 </module>