projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-04 05:16:21 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/services/command/CommandService.java
	src/services/object/ObjectService.java
This commit is contained in:
Treeku
2014-04-13 00:49:58 +01:00
parent 03c5201cf4 7e9bb7ede5
commit 60972655dd
220 changed files with 8160 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/NGECore.java
+19 -6
View File
@@ -60,6 +60,7 @@ import services.GroupService;
import services.housing.HousingService;
import services.InstanceService;
import services.LoginService;
import services.LootService;
import services.MissionService;
import services.PlayerService;
import services.ScriptService;
@@ -71,6 +72,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;
@@ -83,6 +85,7 @@ import services.LoginService;
import services.map.MapService;
import services.object.ObjectService;
import services.object.UpdateService;
import services.resources.HarvesterService;
import services.resources.ResourceService;
import services.retro.RetroService;
import services.spawn.SpawnService;
@@ -171,13 +174,13 @@ public class NGECore {
//public MissionService missionService;
public InstanceService instanceService;
public DevService devService;
public SurveyService surveyService;
public ResourceService resourceService;
public ConversationService conversationService;
public BazaarService bazaarService;
public HousingService housingService;
public LootService lootService;
public HarvesterService harvesterService;
// Login Server
@@ -202,7 +205,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;
@@ -238,6 +241,11 @@ public class NGECore {
if (!(config.loadConfigFile())) {
config = DefaultConfig.getConfig();
}
Config options = new Config();
options.setFilePath("options.cfg");
boolean optionsConfigLoaded = options.loadConfigFile();
// Database
databaseConnection = new DatabaseConnection();
databaseConnection.connect(config.getString("DB.URL"), config.getString("DB.NAME"), config.getString("DB.USER"), config.getString("DB.PASS"), "postgresql");
@@ -261,6 +269,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);
@@ -289,7 +298,10 @@ public class NGECore {
entertainmentService = new EntertainmentService(this);
devService = new DevService(this);
conversationService = new ConversationService(this);
bazaarService = new BazaarService(this);
housingService = new HousingService(this);
lootService = new LootService(this);
harvesterService = new HarvesterService(this);
if (config.keyExists("JYTHONCONSOLE.PORT")) {
int jythonPort = config.getInt("JYTHONCONSOLE.PORT");
@@ -306,7 +318,7 @@ public class NGECore {
aiService = new AIService(this);
//missionService = new MissionService(this);
if (config.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
surveyService = new SurveyService(this);
resourceService = new ResourceService(this);
}
@@ -342,6 +354,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();
@@ -410,7 +423,7 @@ public class NGECore {
objectService.loadBuildings();
if (config.getInt("LOAD.RESOURCE.SYSTEM") == 1) {
if (optionsConfigLoaded && options.getInt("LOAD.RESOURCE.SYSTEM") > 0) {
objectService.loadResourceRoots();
objectService.loadResources();
}