moving classes around
Some checks reported errors
studiorailgun/Renderer/pipeline/head Something is wrong with the build of this commit

This commit is contained in:
austin 2025-05-10 15:56:05 -04:00
parent 3355e65a8c
commit b320bc3e06
9 changed files with 12 additions and 10 deletions

View File

@ -1703,6 +1703,8 @@ GriddedDataCellManager simulates cells that contain creatures
Characters can pursue goal to leave sim range and the real entity is unloaded when they leave range
Move all character to database instead of macro data object
Major work on CharacterService
Move character utils classe to macro data
Move CharacterService to service package

View File

@ -24,12 +24,12 @@ import electrosphere.net.parser.net.message.PlayerMessage;
import electrosphere.net.server.ServerConnectionHandler;
import electrosphere.net.server.player.Player;
import electrosphere.net.template.ServerProtocolTemplate;
import electrosphere.server.character.CharacterService;
import electrosphere.server.character.PlayerCharacterCreation;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerWorldData;
import electrosphere.server.entity.serialization.ContentSerialization;
import electrosphere.server.macro.character.Character;
import electrosphere.server.macro.character.PlayerCharacterCreation;
import electrosphere.server.service.CharacterService;
import electrosphere.util.Utilities;
/**

View File

@ -8,12 +8,12 @@ import electrosphere.engine.Globals;
import electrosphere.entity.Entity;
import electrosphere.entity.state.server.ServerCharacterData;
import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.server.character.CharacterService;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerDataCell;
import electrosphere.server.entity.serialization.ContentSerialization;
import electrosphere.server.macro.MacroData;
import electrosphere.server.saves.SaveUtils;
import electrosphere.server.service.CharacterService;
import electrosphere.util.FileUtils;
import electrosphere.util.math.HashUtils;
import electrosphere.server.macro.character.Character;

View File

@ -5,7 +5,6 @@ import java.util.List;
import electrosphere.engine.Globals;
import electrosphere.logger.LoggerInterface;
import electrosphere.server.character.CharacterService;
import electrosphere.server.datacell.ServerWorldData;
import electrosphere.server.macro.character.Character;
import electrosphere.server.macro.character.CharacterUtils;
@ -18,6 +17,7 @@ import electrosphere.server.macro.spatial.MacroAreaObject;
import electrosphere.server.macro.structure.Structure;
import electrosphere.server.macro.symbolism.Symbol;
import electrosphere.server.macro.town.Town;
import electrosphere.server.service.CharacterService;
import electrosphere.util.FileUtils;
import java.util.Random;

View File

@ -2,13 +2,13 @@ package electrosphere.server.macro.character;
import org.joml.Vector3d;
import electrosphere.server.character.CharacterService;
import electrosphere.server.datacell.Realm;
import electrosphere.server.macro.character.data.CharacterDataStrings;
import electrosphere.server.macro.character.diety.Diety;
import electrosphere.server.macro.race.Race;
import electrosphere.server.macro.structure.Structure;
import electrosphere.server.macro.town.Town;
import electrosphere.server.service.CharacterService;
/**
* Utility functions for dealing with characters

View File

@ -1,4 +1,4 @@
package electrosphere.server.character;
package electrosphere.server.macro.character;
import org.joml.Vector3d;
import org.joml.Vector3i;
@ -15,7 +15,7 @@ import electrosphere.net.server.player.Player;
import electrosphere.net.server.protocol.CharacterProtocol;
import electrosphere.server.datacell.Realm;
import electrosphere.server.datacell.ServerWorldData;
import electrosphere.server.macro.character.Character;
import electrosphere.server.service.CharacterService;
/**
* Deals with spawning player characters

View File

@ -1,4 +1,4 @@
package electrosphere.server.character;
package electrosphere.server.service;
import java.util.HashMap;
import java.util.LinkedList;

View File

@ -15,8 +15,8 @@ import electrosphere.entity.Entity;
import electrosphere.entity.types.creature.CreatureTemplate;
import electrosphere.net.server.ServerConnectionHandler;
import electrosphere.net.server.protocol.CharacterProtocol;
import electrosphere.server.character.PlayerCharacterCreation;
import electrosphere.server.datacell.utils.EntityLookupUtils;
import electrosphere.server.macro.character.PlayerCharacterCreation;
/**
* Utils for testing the engine

View File

@ -12,7 +12,7 @@ import electrosphere.entity.types.creature.CreatureUtils;
import electrosphere.net.NetUtils;
import electrosphere.net.server.ServerConnectionHandler;
import electrosphere.net.server.player.Player;
import electrosphere.server.character.PlayerCharacterCreation;
import electrosphere.server.macro.character.PlayerCharacterCreation;
/**
* Utilities for testing in the viewport