Merge pull request #700 from madsboddum/Removed-unused

Removed unused NGE data loaders
ProjectSWGCore · Jul 21, 2022 · 07b858a · 07b858a
2 parents bd41fb6 + 6e81995
commit 07b858a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 360 deletions.
diff --git a/serverdata/skill/skill_template.sdb b/serverdata/skill/skill_template.sdb
diff --git a/...main/java/com/projectswg/holocore/resources/support/data/server_info/loader/DataLoader.kt b/...main/java/com/projectswg/holocore/resources/support/data/server_info/loader/DataLoader.kt
@@ -43,9 +43,7 @@ abstract class DataLoader {
 		 */
 		fun buffs(): BuffLoader = ServerData.buffs
 		fun skills(): SkillLoader = ServerData.skills
-		fun skillTemplates(): SkillTemplateLoader = ServerData.skillTemplates
 		fun staticItems(): StaticItemLoader = ServerData.staticItems
-		fun itemBonusSets(): ItemBonusSetLoader = ServerData.itemBonusSet
 		fun combatXpMultipliers(): CombatXpMultiplierLoader = ServerData.combatXpMultipliers
 		fun playerLevels(): PlayerLevelLoader = ServerData.playerLevels
 		fun playerRoles(): PlayerRoleLoader = ServerData.playerRoles
@@ -76,7 +74,6 @@ abstract class DataLoader {
 		fun dynamicSpawns(): DynamicSpawnLoader = ServerData.dynamicSpawns
 		fun terrainLevels(): TerrainLevelLoader = ServerData.terrainLevels
 		fun noSpawnZones(): NoSpawnZoneLoader = ServerData.noSpawnZones
-		fun gcwRegionLoader(): GcwRegionLoader = ServerData.gcwRegionLoader
 		fun conversationLoader(): ConversationLoader = ServerData.conversationLoader
 		fun questLoader(): QuestLoader = ServerData.questLoader
 		fun badges(): BadgeLoader = ServerData.badges

diff --git a/...va/com/projectswg/holocore/resources/support/data/server_info/loader/GcwRegionLoader.java b/...va/com/projectswg/holocore/resources/support/data/server_info/loader/GcwRegionLoader.java
diff --git a/...a/com/projectswg/holocore/resources/support/data/server_info/loader/ItemBonusSetLoader.kt b/...a/com/projectswg/holocore/resources/support/data/server_info/loader/ItemBonusSetLoader.kt
diff --git a/...main/java/com/projectswg/holocore/resources/support/data/server_info/loader/ServerData.kt b/...main/java/com/projectswg/holocore/resources/support/data/server_info/loader/ServerData.kt
@@ -50,8 +50,7 @@ object ServerData {
 	 * Skill / Collection
 	 */
 	val skills				by SoftDataLoaderDelegate(::SkillLoader)
-	val skillTemplates		by SoftDataLoaderDelegate(::SkillTemplateLoader)
-
+
 	/*
 	 * Player
 	 */
@@ -60,7 +59,6 @@ object ServerData {
 	val playerStartClothing	by SoftDataLoaderDelegate(::StartClothingLoader)
 	val staticItems			by SoftDataLoaderDelegate(::StaticItemLoader)
 	val performances		by SoftDataLoaderDelegate(::PerformanceLoader)
-	val itemBonusSet		by SoftDataLoaderDelegate(::ItemBonusSetLoader)
 	val combatXpMultipliers	by SoftDataLoaderDelegate(::CombatXpMultiplierLoader)
 
 	/*
@@ -94,7 +92,6 @@ object ServerData {
 	val dynamicSpawns		by SoftDataLoaderDelegate(::DynamicSpawnLoader)
 	val terrainLevels		by SoftDataLoaderDelegate(::TerrainLevelLoader)
 	val noSpawnZones		by SoftDataLoaderDelegate(::NoSpawnZoneLoader)
-	val gcwRegionLoader		by SoftDataLoaderDelegate(::GcwRegionLoader)
 	val conversationLoader	by SoftDataLoaderDelegate(::ConversationLoader)
 	val questLoader			by SoftDataLoaderDelegate(::QuestLoader)
 	val badges  			by SoftDataLoaderDelegate(::BadgeLoader)

diff --git a/...om/projectswg/holocore/resources/support/data/server_info/loader/SkillTemplateLoader.java b/...om/projectswg/holocore/resources/support/data/server_info/loader/SkillTemplateLoader.java