projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-07 22:13:40 -04:00
Code Issues Projects Releases Wiki Activity

Refactored ClientFactory to be used statically

Browse Source
This commit is contained in:
Waverunner
2015-06-05 10:37:04 -04:00
parent 0d61bcfb65
commit c58df94b3c
8 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/buildouts/BuildoutLoader.java
+4 -6
View File
@@ -39,9 +39,7 @@ import resources.objects.SWGObject;
import resources.server_info.Log;
public class BuildoutLoader {
private static final ClientFactory clientFactory = new ClientFactory();
private static final CrcStringTableData crcTable = (CrcStringTableData) clientFactory.getInfoFromFile("misc/object_template_crc_string_table.iff");
private static final CrcStringTableData crcTable = (CrcStringTableData) ClientFactory.getInfoFromFile("misc/object_template_crc_string_table.iff");
public static List <SWGObject> loadAllBuildouts() {
List <SWGObject> objects = new LinkedList<SWGObject>();
@@ -51,10 +49,10 @@ public class BuildoutLoader {
}
public static List <SWGObject> loadBuildoutsForTerrain(Terrain terrain) {
DatatableData table = (DatatableData) clientFactory.getInfoFromFile("datatables/buildout/buildout_scenes.iff");
DatatableData table = (DatatableData) ClientFactory.getInfoFromFile("datatables/buildout/buildout_scenes.iff");
for (int row = 0; row < table.getRowCount(); row++) {
if (table.getCell(row, 0).equals(terrain.name().toLowerCase(Locale.ENGLISH))) {
TerrainBuildoutLoader loader = new TerrainBuildoutLoader(clientFactory, crcTable, terrain);
TerrainBuildoutLoader loader = new TerrainBuildoutLoader(crcTable, terrain);
loader.load(row);
return loader.getObjects();
}
@@ -65,7 +63,7 @@ public class BuildoutLoader {
}
private static List <Terrain> getTerrainsToLoad() {
DatatableData table = (DatatableData) clientFactory.getInfoFromFile("datatables/buildout/buildout_scenes.iff");
DatatableData table = (DatatableData) ClientFactory.getInfoFromFile("datatables/buildout/buildout_scenes.iff");
List <Terrain> terrains = new LinkedList<Terrain>();
for (int row = 0; row < table.getRowCount(); row++) {
Terrain t = Terrain.getTerrainFromName((String) table.getCell(row, 0));
src/resources/objects/buildouts/TerrainBuildoutLoader.java
+4 -6
View File
@@ -45,15 +45,13 @@ import services.objects.ObjectCreator;
class TerrainBuildoutLoader {
private static final String BASE_PATH = "datatables/buildout/";
private final ClientFactory clientFactory;
private final CrcStringTableData crcTable;
private final Terrain terrain;
private final Map <Long, SWGObject> objectTable;
private final List <SWGObject> objects;
public TerrainBuildoutLoader(ClientFactory clientFactory, CrcStringTableData crcTable, Terrain terrain) {
this.clientFactory = clientFactory;
public TerrainBuildoutLoader(CrcStringTableData crcTable, Terrain terrain) {
this.crcTable = crcTable;
this.terrain = terrain;
this.objectTable = new Hashtable<Long, SWGObject>(12*1024);
@@ -72,7 +70,7 @@ class TerrainBuildoutLoader {
private void loadAreas(int sceneNumber) {
objects.clear();
String file = BASE_PATH+"areas_"+terrain.getName()+".iff";
DatatableData areaTable = (DatatableData) clientFactory.getInfoFromFile(file);
DatatableData areaTable = (DatatableData) ClientFactory.getInfoFromFile(file);
for (int row = 0; row < areaTable.getRowCount(); row++) {
BuildoutArea area = new BuildoutArea();
area.load(areaTable.getRow(row), sceneNumber, row);
@@ -84,7 +82,7 @@ class TerrainBuildoutLoader {
private void loadArea(BuildoutArea area) {
String file = BASE_PATH+terrain.getName()+"/"+area.getName().replace("server", "client")+".iff";
DatatableData areaTable = (DatatableData) clientFactory.getInfoFromFile(file);
DatatableData areaTable = (DatatableData) ClientFactory.getInfoFromFile(file);
BuildoutRow buildoutRow = new BuildoutRow(area);
for (int row = 0; row < areaTable.getRowCount(); row++) {
buildoutRow.load(areaTable.getRow(row), crcTable);