Skip to content

Draft schematic group loader #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Josh-Larson merged 2 commits into from
Apr 26, 2024
Merged

Draft schematic group loader #1523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6886951
Created converter for schematic_group.sdb and converted the file
madsboddum Jul 28, 2023
26e83a4
Created data loader for schematic groups, which we will need later to…
madsboddum Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,653 changes: 1,653 additions & 0 deletions serverdata/crafting/schematic_group.sdb
View file
Open in desktop

Large diffs are not rendered by default.

69 changes: 69 additions & 0 deletions ...com/projectswg/holocore/resources/support/data/server_info/loader/SchematicGroupLoader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
/***********************************************************************************
* Copyright (c) 2024 /// 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 SchematicGroupLoader : DataLoader() {

private val schematicGroupMap = mutableMapOf<String, MutableCollection<String>>()

/**
* Returns a collection of all schematic names in the given group
* Example: getSchematicsInGroup("craftDroidDamageRepairA") returns a collection of ["object/draft_schematic/droid/droid_damage_repair_kit_a.iff"]
*/
fun getSchematicsInGroup(groupId: String): Collection<String> {
return schematicGroupMap.getOrElse(groupId) { emptyList() }
}

override fun load() {
val set = SdbLoader.load(File("serverdata/crafting/schematic_group.sdb"))

set.use {
while (set.next()) {
val groupid = set.getText("groupid")
val schematicname = set.getText("schematicname")

if (groupid != "end") {
ensureSchematicGroupExists(groupid)
appendSchematicToGroup(groupid, schematicname)
}
}
}
}

private fun appendSchematicToGroup(groupid: String, schematicname: String) {
schematicGroupMap[groupid]?.add(schematicname)
}

private fun ensureSchematicGroupExists(groupid: String) {
if (!schematicGroupMap.containsKey(groupid)) {
schematicGroupMap[groupid] = mutableListOf()
}
}
}
3 changes: 2 additions & 1 deletion ...main/java/com/projectswg/holocore/resources/support/data/server_info/loader/ServerData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***********************************************************************************
* Copyright (c) 2023 /// Project SWG /// www.projectswg.com *
* Copyright (c) 2024 /// 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. *
Expand Down Expand Up @@ -112,6 +112,7 @@ object ServerData {
val planetChatRooms by SoftDataLoaderDelegate(::PlanetChatRoomLoader)
val staticCityPoints by SoftDataLoaderDelegate(::StaticCityPointLoader)
val npcEquipment by SoftDataLoaderDelegate(::NpcEquipmentLoader)
val schematicGroups by SoftDataLoaderDelegate(::SchematicGroupLoader)

private class WeakDataLoaderDelegate<T: DataLoader>(loaderCreator: () -> T): DataLoaderDelegate<T>(::WeakReference, loaderCreator)
private class SoftDataLoaderDelegate<T: DataLoader>(loaderCreator: () -> T): DataLoaderDelegate<T>(::SoftReference, loaderCreator)
Expand Down
67 changes: 67 additions & 0 deletions ...projectswg/holocore/resources/support/data/server_info/loader/SchematicGroupLoaderTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/***********************************************************************************
* Copyright (c) 2024 /// 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 SchematicGroupLoaderTest {
@Test
fun groupsByGroupIdCorrectly() {
val groupId = "craftAdvancedCreatureGroup"
val expected = setOf(
"object/draft_schematic/bio_engineer/creature/creature_torton.iff",
"object/draft_schematic/bio_engineer/creature/creature_kimogila.iff",
"object/draft_schematic/bio_engineer/creature/creature_rancor.iff",
"object/draft_schematic/bio_engineer/creature/creature_fambaa.iff",
"object/draft_schematic/bio_engineer/creature/creature_veermok.iff",
"object/draft_schematic/bio_engineer/creature/creature_graul.iff",
"object/draft_schematic/bio_engineer/creature/creature_huf_dun.iff",
"object/draft_schematic/bio_engineer/creature/creature_malkloc.iff",
"object/draft_schematic/bio_engineer/creature/creature_sharnaff.iff",
"object/draft_schematic/bio_engineer/creature/creature_woolamander.iff",
)

val schematicsInGroup = ServerData.schematicGroups.getSchematicsInGroup(groupId)

assertEquals(expected.size, schematicsInGroup.size)
assertTrue(schematicsInGroup.containsAll(expected))
}

@Test
fun unknownGroupIdGivesEmptyCollection() {
val schematicsInGroup = ServerData.schematicGroups.getSchematicsInGroup("thisGroupDefinitelyDoesNotExist")
assertTrue(schematicsInGroup.isEmpty())
}

@Test
fun endGroupIdIsIgnored() {
// There's a group called "end" in the client info file, but it's not a real group
val schematicsInGroup = ServerData.schematicGroups.getSchematicsInGroup("end")
assertTrue(schematicsInGroup.isEmpty())
}
}
27 changes: 1 addition & 26 deletions src/utility/java/com/projectswg/utility/ClientdataConvertAll.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
/***********************************************************************************
* 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.utility;

import com.projectswg.utility.clientdata.Converters;
Expand Down Expand Up @@ -53,6 +27,7 @@ public static void main(String [] args) throws IOException {
Converters.APPEARANCE_TABLE.load();
Converters.QUESTLIST.load();
Converters.QUESTTASK.load();
Converters.SCHEMATIC_GROUP.load();
}

}
27 changes: 1 addition & 26 deletions src/utility/java/com/projectswg/utility/clientdata/Converters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
/***********************************************************************************
* 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.utility.clientdata;

import java.util.function.Supplier;
Expand All @@ -47,6 +21,7 @@ public enum Converters {
APPEARANCE_TABLE (() -> new ConvertDatatable("datatables/appearance/appearance_table.iff", "serverdata/appearance/appearance_table.sdb", true)),
QUESTLIST (ConvertQuestLists::new),
QUESTTASK (ConvertQuestTasks::new),
SCHEMATIC_GROUP (() -> new ConvertDatatable("datatables/crafting/schematic_group.iff", "serverdata/crafting/schematic_group.sdb", true)),
TERRAINS (ConvertTerrain::new);

private final Supplier<Converter> converter;
Expand Down