Started work on bazaar

This commit is contained in:
Light2
2014-04-11 23:47:03 +02:00
parent 7eaed057c7
commit ea8bc53394
25 changed files with 1349 additions and 10 deletions
+6 -3
View File
@@ -70,6 +70,7 @@ import services.SurveyService;
import services.TerrainService;
import services.WeatherService;
import services.ai.AIService;
import services.bazaar.BazaarService;
import services.chat.ChatService;
import services.collections.CollectionService;
import services.combat.CombatService;
@@ -170,11 +171,10 @@ public class NGECore {
//public MissionService missionService;
public InstanceService instanceService;
public DevService devService;
public SurveyService surveyService;
public ResourceService resourceService;
public ConversationService conversationService;
public BazaarService bazaarService;
// Login Server
@@ -199,7 +199,7 @@ public class NGECore {
private BusConfiguration eventBusConfig = BusConfiguration.Default(1, new ThreadPoolExecutor(1, 4, 1, TimeUnit.MINUTES, new LinkedBlockingQueue<Runnable>()));
private ObjectDatabase buildingODB;
private ObjectDatabase auctionODB;
private ObjectDatabase resourcesODB;
private ObjectDatabase resourceRootsODB;
private ObjectDatabase resourceHistoryODB;
@@ -258,6 +258,7 @@ public class NGECore {
resourcesODB = new ObjectDatabase("resources", true, false, true);
resourceRootsODB = new ObjectDatabase("resourceroots", true, false, true);
resourceHistoryODB = new ObjectDatabase("resourcehistory", true, false, true);
auctionODB = new ObjectDatabase("auction", true, false, true);
// Services
loginService = new LoginService(this);
@@ -286,6 +287,7 @@ public class NGECore {
entertainmentService = new EntertainmentService(this);
devService = new DevService(this);
conversationService = new ConversationService(this);
bazaarService = new BazaarService(this);
if (config.keyExists("JYTHONCONSOLE.PORT")) {
int jythonPort = config.getInt("JYTHONCONSOLE.PORT");
@@ -338,6 +340,7 @@ public class NGECore {
zoneDispatch.addService(buffService);
zoneDispatch.addService(entertainmentService);
//zoneDispatch.addService(missionService);
zoneDispatch.addService(bazaarService);
zoneServer = new MINAServer(zoneDispatch, config.getInt("ZONE.PORT"));
zoneServer.start();