projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-17 00:06:00 -05:00
Code Issues Projects Releases Wiki Activity

Replaced last usage of deprecated ServerFactory in MapService with SdbLoader

Browse Source
This commit is contained in:
Ziggy
2023-05-28 22:53:38 +02:00
parent 9fe0923661
commit 127d5d14c6
5 changed files with 131 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
serverdata/map/static_city_points.sdf → serverdata/map/static_city_points.sdb
View File

@@ -1,5 +1,5 @@
planet city x z
s s f f
TEXT TEXT REAL REAL
tatooine Bestine -1290 -3590
tatooine Mos Espa -2902 2130
tatooine Mos Entha 1291 3138

1
src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/ServerData.kt
View File

@@ -110,6 +110,7 @@ object ServerData {
val cloningFacilities by SoftDataLoaderDelegate(::CloningFacilityLoader)
val defaultChatRooms by SoftDataLoaderDelegate(::DefaultChatRoomLoader)
val planetChatRooms by SoftDataLoaderDelegate(::PlanetChatRoomLoader)
val staticCityPoints by SoftDataLoaderDelegate(::StaticCityPointLoader)
private class WeakDataLoaderDelegate<T: DataLoader>(loaderCreator: () -> T): DataLoaderDelegate<T>(::WeakReference, loaderCreator)
private class SoftDataLoaderDelegate<T: DataLoader>(loaderCreator: () -> T): DataLoaderDelegate<T>(::SoftReference, loaderCreator)

56
src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/StaticCityPointLoader.kt Normal file
View File

@@ -0,0 +1,56 @@
/***********************************************************************************
* Copyright (c) 2023 /// Project SWG /// www.projectswg.com *
* *
* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
* Our goal is to create an emulator which will provide a server for players to *
* continue playing a game similar to the one they used to play. We are basing *
* it on the final publish of the game prior to end-game events. *
* *
* This file is part of Holocore. *
* *
* --------------------------------------------------------------------------------*
* *
* Holocore is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* Holocore is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with Holocore. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
package com.projectswg.holocore.resources.support.data.server_info.loader
import com.projectswg.holocore.resources.support.data.server_info.SdbLoader
import java.io.File
class StaticCityPointLoader : DataLoader() {
private val planetToStaticCityPoints = mutableListOf<StaticCityPoint>()
fun getAllPoints(): Collection<StaticCityPoint> {
return planetToStaticCityPoints
}
override fun load() {
val set = SdbLoader.load(File("serverdata/map/static_city_points.sdb"))
set.use {
while (set.next()) {
val planet = set.getText("planet")
val city = set.getText("city")
val x = set.getReal("x").toFloat()
val z = set.getReal("z").toFloat()
planetToStaticCityPoints += StaticCityPoint(planet, city, x, z)
}
}
}
}
data class StaticCityPoint(val planet: String, val city: String, val x: Float, val z: Float)

49
src/main/java/com/projectswg/holocore/services/gameplay/world/map/MapService.java
View File

@@ -1,17 +1,40 @@
/***********************************************************************************
* Copyright (c) 2023 /// Project SWG /// www.projectswg.com *
* *
* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
* Our goal is to create an emulator which will provide a server for players to *
* continue playing a game similar to the one they used to play. We are basing *
* it on the final publish of the game prior to end-game events. *
* *
* This file is part of Holocore. *
* *
* --------------------------------------------------------------------------------*
* *
* Holocore is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* Holocore is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with Holocore. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
package com.projectswg.holocore.services.gameplay.world.map;
import com.projectswg.common.data.encodables.map.MapLocation;
import com.projectswg.common.data.location.Location;
import com.projectswg.common.data.swgfile.visitors.DatatableData;
import com.projectswg.common.network.packets.SWGPacket;
import com.projectswg.common.network.packets.swg.zone.spatial.GetMapLocationsMessage;
import com.projectswg.common.network.packets.swg.zone.spatial.GetMapLocationsResponseMessage;
import com.projectswg.holocore.intents.support.global.network.InboundPacketIntent;
import com.projectswg.holocore.intents.support.objects.swg.ObjectCreatedIntent;
import com.projectswg.holocore.resources.gameplay.world.map.MappingTemplate;
import com.projectswg.holocore.resources.support.data.client_info.ServerFactory;
import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader;
import com.projectswg.holocore.resources.support.data.server_info.loader.MappingTemplateLoader;
import com.projectswg.holocore.resources.support.data.server_info.loader.*;
import com.projectswg.holocore.resources.support.data.server_info.loader.PlanetMapCategoryLoader.PlanetMapCategoryInfo;
import com.projectswg.holocore.resources.support.global.player.Player;
import com.projectswg.holocore.resources.support.objects.swg.SWGObject;
@@ -19,6 +42,7 @@ import me.joshlarson.jlcommon.control.IntentHandler;
import me.joshlarson.jlcommon.control.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -80,21 +104,16 @@ public class MapService extends Service {
}
private void loadStaticCityPoints() {
DatatableData table = ServerFactory.getDatatable("map/static_city_points.iff");
Collection<StaticCityPoint> allPoints = ServerData.INSTANCE.getStaticCityPoints().getAllPoints();
PlanetMapCategoryInfo mapCategory = DataLoader.Companion.planetMapCategories().getCategoryByName("city");
assert mapCategory != null;
byte city = (byte) mapCategory.getIndex();
for (int row = 0; row < table.getRowCount(); row++) {
List<MapLocation> locations = staticMapLocations.get(table.getCell(row, 0).toString());
if (locations == null) {
locations = new ArrayList<>();
staticMapLocations.put((String) table.getCell(row, 0), locations);
}
for (StaticCityPoint point : allPoints) {
List<MapLocation> locations = staticMapLocations.computeIfAbsent(point.getPlanet(), k -> new ArrayList<>());
String name = (String) table.getCell(row, 1);
float x = (float) table.getCell(row, 2);
float z = (float) table.getCell(row, 3);
String name = point.getCity();
float x = point.getX();
float z = point.getZ();
locations.add(new MapLocation(locations.size() + 1, name, x, z, city, (byte) 0, false));
}
}

39
src/test/java/com/projectswg/holocore/resources/support/data/server_info/loader/StaticCityPointLoaderTest.kt Normal file
View File

@@ -0,0 +1,39 @@
/***********************************************************************************
* Copyright (c) 2023 /// Project SWG /// www.projectswg.com *
* *
* ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on *
* July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. *
* Our goal is to create an emulator which will provide a server for players to *
* continue playing a game similar to the one they used to play. We are basing *
* it on the final publish of the game prior to end-game events. *
* *
* This file is part of Holocore. *
* *
* --------------------------------------------------------------------------------*
* *
* Holocore is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Affero General Public License as *
* published by the Free Software Foundation, either version 3 of the *
* License, or (at your option) any later version. *
* *
* Holocore is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Affero General Public License for more details. *
* *
* You should have received a copy of the GNU Affero General Public License *
* along with Holocore. If not, see <http://www.gnu.org/licenses/>. *
***********************************************************************************/
package com.projectswg.holocore.resources.support.data.server_info.loader
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.Test
class StaticCityPointLoaderTest {
@Test
fun `can load static city points`() {
val allPoints = ServerData.staticCityPoints.getAllPoints()
assertTrue(allPoints.isNotEmpty())
}
}