Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleMapFactory

Browse Source
This commit is contained in:
P0nk
2021-09-09 22:25:34 +02:00
parent f8f524bfe7
commit 0d13686f07
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/client/command/commands/gm1/GotoCommand.java
View File

@@ -47,13 +47,13 @@ public class GotoCommand extends Command {
// thanks shavit for noticing goto areas getting loaded from wz needlessly only for the name retrieval
for (Map.Entry<String, Integer> e : towns) {
GOTO_TOWNS_INFO += ("'" + e.getKey() + "' - #b" + (MapleMapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
GOTO_TOWNS_INFO += ("'" + e.getKey() + "' - #b" + (MapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
}
List<Entry<String, Integer>> areas = new ArrayList<>(GameConstants.GOTO_AREAS.entrySet());
sortGotoEntries(areas);
for (Map.Entry<String, Integer> e : areas) {
GOTO_AREAS_INFO += ("'" + e.getKey() + "' - #b" + (MapleMapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
GOTO_AREAS_INFO += ("'" + e.getKey() + "' - #b" + (MapFactory.loadPlaceName(e.getValue())) + "#k\r\n");
}
} catch (Exception e) {
e.printStackTrace();

27
src/main/java/server/maps/MapleMapFactory.java → src/main/java/server/maps/MapFactory.java
View File

@@ -41,16 +41,15 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
public class MapleMapFactory {
public class MapFactory {
private static final Data nameData;
private static final DataProvider mapSource;
private static Data nameData;
private static DataProvider mapSource;
static {
nameData = DataProviderFactory.getDataProvider(WZFiles.STRING).getData("Map.img");
mapSource = DataProviderFactory.getDataProvider(WZFiles.MAP);
}
private static void loadLifeFromWz(MapleMap map, Data mapData) {
for (Data life : mapData.getChildByPath("life")) {
life.getName();
@@ -74,7 +73,7 @@ public class MapleMapFactory {
int y = DataTool.getInt(life.getChildByPath("y"));
int hide = DataTool.getInt("hide", life, 0);
int mobTime = DataTool.getInt("mobTime", life, 0);
loadLifeRaw(map, Integer.parseInt(id), type, cy, f, fh, rx0, rx1, x, y, hide, mobTime, team);
}
}
@@ -128,7 +127,7 @@ public class MapleMapFactory {
public static MapleMap loadMapFromWz(int mapid, int world, int channel, EventInstanceManager event) {
MapleMap map;
String mapName = getMapName(mapid);
Data mapData = mapSource.getData(mapName); // source.getData issue with giving nulls in rare ocasions found thanks to MedicOP
Data infoData = mapData.getChildByPath("info");
@@ -299,10 +298,10 @@ public class MapleMapFactory {
}
}
}
map.setMapName(loadPlaceName(mapid));
map.setStreetName(loadStreetName(mapid));
map.setClock(mapData.getChildByPath("clock") != null);
map.setEverlast(DataTool.getIntConvert("everlast", infoData, 0) != 0); // thanks davidlafriniere for noticing value 0 accounting as true
map.setTown(DataTool.getIntConvert("town", infoData, 0) != 0);
@@ -313,7 +312,7 @@ public class MapleMapFactory {
map.setTimeLimit(DataTool.getIntConvert("timeLimit", infoData, -1));
map.setFieldType(DataTool.getIntConvert("fieldType", infoData, 0));
map.setMobCapacity(DataTool.getIntConvert("fixedMobCapacity", infoData, 500));//Is there a map that contains more than 500 mobs?
Data recData = infoData.getChildByPath("recovery");
if (recData != null) {
map.setRecovery(DataTool.getFloat(recData));
@@ -337,7 +336,7 @@ public class MapleMapFactory {
return map;
}
private static AbstractLoadedLife loadLife(int id, String type, int cy, int f, int fh, int rx0, int rx1, int x, int y, int hide) {
AbstractLoadedLife myLife = LifeFactory.getLife(id, type);
myLife.setCy(cy);
@@ -414,7 +413,7 @@ public class MapleMapFactory {
builder.append("/").append(mapid);
return builder.toString();
}
public static String loadPlaceName(int mapid) {
try {
return DataTool.getString("mapName", nameData.getChildByPath(getMapStringName(mapid)), "");
@@ -422,7 +421,7 @@ public class MapleMapFactory {
return "";
}
}
public static String loadStreetName(int mapid) {
try {
return DataTool.getString("streetName", nameData.getChildByPath(getMapStringName(mapid)), "");
@@ -430,5 +429,5 @@ public class MapleMapFactory {
return "";
}
}
}

7
src/main/java/server/maps/MapleMapManager.java
View File

@@ -19,8 +19,6 @@
*/
package server.maps;
import java.util.HashMap;
import java.util.Map;
import net.server.audit.locks.MonitoredLockType;
import net.server.audit.locks.MonitoredReadLock;
import net.server.audit.locks.MonitoredReentrantReadWriteLock;
@@ -29,6 +27,9 @@ import net.server.audit.locks.factory.MonitoredReadLockFactory;
import net.server.audit.locks.factory.MonitoredWriteLockFactory;
import scripting.event.EventInstanceManager;
import java.util.HashMap;
import java.util.Map;
public class MapleMapManager {
private int channel, world;
@@ -76,7 +77,7 @@ public class MapleMapManager {
}
}
map = MapleMapFactory.loadMapFromWz(mapid, world, channel, event);
map = MapFactory.loadMapFromWz(mapid, world, channel, event);
if (cache) {
mapsWLock.lock();