projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-09-11 21:45:26 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #706 from Josh-Larson/improvement_deprecate_dataloader

Browse Source 
Started moving away from DataLoader functions
This commit is contained in:
Josh Larson
2022-07-23 13:37:09 -05:00
committed by GitHub
parent c38cdc190f 5e17c55e95
commit 98144e2f81
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/projectswg/holocore/resources/support/npc/ai/NpcCombatMode.kt
+3 -3
View File
@@ -12,7 +12,7 @@ import com.projectswg.holocore.intents.support.npc.ai.StartNpcMovementIntent
import com.projectswg.holocore.intents.support.npc.ai.StopNpcMovementIntent
import com.projectswg.holocore.intents.support.objects.swg.MoveObjectIntent
import com.projectswg.holocore.resources.support.color.SWGColor
import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader
import com.projectswg.holocore.resources.support.data.server_info.loader.ServerData
import com.projectswg.holocore.resources.support.data.server_info.mongodb.PswgDatabase
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject
import com.projectswg.holocore.resources.support.objects.swg.custom.AIBehavior
@@ -132,11 +132,11 @@ class NpcCombatMode(obj: AIObject) : NpcMode(obj) {
MoveObjectIntent.broadcast(obj, obj.parent, Location.builder(myLocation).setHeading(headingTo).build(), npcRunSpeed)
if (target.posture == Posture.INCAPACITATED) {
QueueCommandIntent.broadcast(obj, target, "", DataLoader.commands().getCommand("deathblow"), 0)
QueueCommandIntent.broadcast(obj, target, "", ServerData.commands.getCommand("deathblow"), 0)
return
}
QueueCommandIntent.broadcast(obj, target, "", DataLoader.commands().getCommand(getWeaponCommand(weapon)), 0)
QueueCommandIntent.broadcast(obj, target, "", ServerData.commands.getCommand(getWeaponCommand(weapon)), 0)
}
private fun requestAssistance() {
src/main/java/com/projectswg/holocore/resources/support/npc/spawn/Spawner.kt
+5 -5
View File
@@ -27,7 +27,7 @@
package com.projectswg.holocore.resources.support.npc.spawn
import com.projectswg.common.data.location.Location
import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader
import com.projectswg.holocore.resources.support.data.server_info.loader.ServerData
import com.projectswg.holocore.resources.support.data.server_info.loader.combat.FactionLoader.Faction
import com.projectswg.holocore.resources.support.data.server_info.loader.npc.NpcLoader.*
import com.projectswg.holocore.resources.support.data.server_info.loader.npc.NpcPatrolRouteLoader.PatrolRouteWaypoint
@@ -47,7 +47,7 @@ import java.util.stream.Collectors
class Spawner(spawn: SpawnInfo, egg: SWGObject) {
private val spawn: SpawnInfo = Objects.requireNonNull(spawn, "spawn")
private val npc: NpcInfo = Objects.requireNonNull(DataLoader.npcs().getNpc(spawn.npcId), "Invalid npc id: " + spawn.npcId)
private val npc: NpcInfo = Objects.requireNonNull(ServerData.npcs.getNpc(spawn.npcId), "Invalid npc id: " + spawn.npcId)
private val npcsInternal = CopyOnWriteArrayList<AIObject>()
val location: Location = Location.builder().setTerrain(spawn.terrain).setPosition(spawn.x, spawn.y, spawn.z).setHeading(spawn.heading.toDouble()).build()
@@ -167,10 +167,10 @@ class Spawner(spawn: SpawnInfo, egg: SWGObject) {
get() = npc.hue
val defaultWeapon: List<String>
get() = npc.defaultWeapon.stream().map { DataLoader.npcWeapons().getWeapons(it) }.filter { Objects.nonNull(it) }.flatMap { it.stream() }.collect(Collectors.toList())
get() = npc.defaultWeapon.stream().map { ServerData.npcWeapons.getWeapons(it) }.filter { Objects.nonNull(it) }.flatMap { it.stream() }.collect(Collectors.toList())
val thrownWeapon: List<String>
get() = npc.thrownWeapon.stream().map { DataLoader.npcWeapons().getWeapons(it) }.filter { Objects.nonNull(it) }.flatMap { it.stream() }.collect(Collectors.toList())
get() = npc.thrownWeapon.stream().map { ServerData.npcWeapons.getWeapons(it) }.filter { Objects.nonNull(it) }.flatMap { it.stream() }.collect(Collectors.toList())
val aggressiveRadius: Int
get() = npc.aggressiveRadius
@@ -212,7 +212,7 @@ class Spawner(spawn: SpawnInfo, egg: SWGObject) {
if (spawn.patrolId.isEmpty() || spawn.patrolId == "0") { // TODO: Replace the latter with empty string
this.patrolRoute = null
} else {
val waypoints = Objects.requireNonNull(DataLoader.npcPatrolRoutes().getPatrolRoute(spawn.patrolId), "Invalid patrol route: " + spawn.patrolId)
val waypoints = Objects.requireNonNull(ServerData.npcPatrolRoutes.getPatrolRoute(spawn.patrolId), "Invalid patrol route: " + spawn.patrolId)
this.patrolRoute = waypoints.stream().map { ResolvedPatrolWaypoint(it) }.collect(Collectors.toList())
}
}
src/main/java/com/projectswg/holocore/resources/support/objects/StaticItemCreator.kt
+1 -2
View File
@@ -28,7 +28,6 @@
package com.projectswg.holocore.resources.support.objects
import com.projectswg.common.data.combat.DamageType
import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader
import com.projectswg.holocore.resources.support.data.server_info.loader.ServerData
import com.projectswg.holocore.resources.support.data.server_info.loader.StaticItemLoader
import com.projectswg.holocore.resources.support.objects.swg.SWGObject
@@ -42,7 +41,7 @@ import com.projectswg.holocore.resources.support.objects.swg.weapon.WeaponObject
object StaticItemCreator {
fun createItem(itemName: String): SWGObject? {
val info = DataLoader.staticItems().getItemByName(itemName) ?: return null
val info = ServerData.staticItems.getItemByName(itemName) ?: return null
val swgObject = ObjectCreator.createObjectFromTemplate(info.iffTemplate) as? TangibleObject ?: return null
applyAttributes(swgObject, info)
src/main/java/com/projectswg/holocore/services/support/npc/spawn/SpawnerService.kt
+4 -5
View File
@@ -37,7 +37,7 @@ import com.projectswg.holocore.intents.support.global.zone.PlayerEventIntent
import com.projectswg.holocore.intents.support.objects.swg.DestroyObjectIntent
import com.projectswg.holocore.intents.support.objects.swg.ObjectCreatedIntent
import com.projectswg.holocore.resources.support.data.server_info.StandardLog
import com.projectswg.holocore.resources.support.data.server_info.loader.DataLoader
import com.projectswg.holocore.resources.support.data.server_info.loader.ServerData
import com.projectswg.holocore.resources.support.data.server_info.mongodb.PswgDatabase
import com.projectswg.holocore.resources.support.global.player.PlayerEvent
import com.projectswg.holocore.resources.support.npc.spawn.NPCCreator
@@ -57,7 +57,6 @@ import me.joshlarson.jlcommon.concurrency.ScheduledThreadPool
import me.joshlarson.jlcommon.control.IntentHandler
import me.joshlarson.jlcommon.control.Service
import me.joshlarson.jlcommon.log.Log
import java.util.*
import java.util.concurrent.ConcurrentHashMap
import java.util.stream.Collectors
@@ -176,7 +175,7 @@ class SpawnerService : Service() {
val startTime = StandardLog.onStartLoad("spawners")
var count = 0
for (spawn in DataLoader.npcStaticSpawns().spawns) {
for (spawn in ServerData.npcStaticSpawns.spawns) {
try {
spawn(spawn)
count++
@@ -192,8 +191,8 @@ class SpawnerService : Service() {
private fun spawn(spawn: SpawnInfo) {
val npcId = spawn.npcId
if (DataLoader.npcs().getNpc(npcId) == null) {
Log.w("Invalid npc %s", npcId);
if (ServerData.npcs.getNpc(npcId) == null) {
Log.w("Invalid npc %s", npcId)
return
}