lotta macro work

docs/src/progress/renderertodo.md

@@ -1716,6 +1716,12 @@ Macro sim triggers character to try to get mats to build structure
 (05/11/2025)
 Fix inventory handling in creature templates
 Fix character data associated ids serialization bug
+Block generation doesn't generate structures that are repairable
+Fix character template inventory not clearing
+Character data tracks associated player id
+Player characters not simulated at macro level
+Macro simulation inventory utilities
+Build structure goal properly working from macro sim
 
 
 

src/main/java/electrosphere/entity/ServerEntityUtils.java

@@ -7,6 +7,7 @@ import org.joml.Vector3d;
 import electrosphere.engine.Globals;
 import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
+import electrosphere.entity.state.server.ServerCharacterData;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.net.parser.net.message.EntityMessage;
@@ -165,6 +166,9 @@ public class ServerEntityUtils {
         if(Globals.aiManager != null){
             Globals.aiManager.removeAI(entity);
         }
+        if(ServerCharacterData.hasServerCharacterDataTree(entity)){
+            Globals.characterService.removeEntity(ServerCharacterData.getServerCharacterData(entity).getCharacterData());
+        }
 
         //
         //deregister all behavior trees

src/main/java/electrosphere/entity/state/server/ServerCharacterData.java

@@ -1,5 +1,6 @@
 package electrosphere.entity.state.server;
 
+import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.server.macro.character.Character;
@@ -37,6 +38,7 @@ public class ServerCharacterData {
     public static void attachServerCharacterData(Entity entity, Character charaData){
         ServerCharacterData tree = new ServerCharacterData(entity, charaData);
         entity.putData(EntityDataStrings.TREE_SERVERCHARACTERDATA, tree);
+        Globals.characterService.setEntity(charaData, entity);
     }
 
     /**

src/main/java/electrosphere/entity/types/creature/CreatureInventoryData.java

@@ -154,5 +154,29 @@ public class CreatureInventoryData {
         return naturalIdMap.get(slot);
     }
 
+    /**
+     * Gets all items in the inventory data
+     * @return The list of all items
+     */
+    public List<EntitySerialization> getAllItems(){
+        List<EntitySerialization> rVal = new LinkedList<EntitySerialization>();
+        rVal.addAll(this.naturalItems);
+        rVal.addAll(this.equipItemMap.values());
+        rVal.addAll(this.toolbarItemMap.values());
+        return rVal;
+    }
+
+    /**
+     * Clears the serialization
+     */
+    public void clear(){
+        this.naturalIdMap.clear();
+        this.equippedIdMap.clear();
+        this.toolbarIdMap.clear();
+        this.naturalItems.clear();
+        this.equipItemMap.clear();
+        this.toolbarItemMap.clear();
+    }
+
 }
 

src/main/java/electrosphere/entity/types/creature/CreatureUtils.java

@@ -555,6 +555,7 @@ public class CreatureUtils {
     public static CreatureTemplate getCreatureTemplate(Entity e){
         CreatureTemplate template = (CreatureTemplate)e.getData(EntityDataStrings.CREATURE_TEMPLATE);
         CreatureInventoryData inventoryData = template.getInventoryData();
+        inventoryData.clear();
         if(ServerEquipState.hasEquipState(e)){
             ServerEquipState serverEquipState = ServerEquipState.getEquipState(e);
             for(String point : serverEquipState.equippedPoints()){

src/main/java/electrosphere/server/macro/character/Character.java

@@ -18,6 +18,11 @@ public class Character implements MacroObject {
      * The id of the character object
      */
     int id;
+
+    /**
+     * The associated player's id
+     */
+    int playerId;
     
     /**
      * Data stored on the character
@@ -50,6 +55,22 @@ public class Character implements MacroObject {
     public void setId(int id){
         this.id = id;
     }
+
+    /**
+     * Gets the associated player's id
+     * @return The id of the associated player
+     */
+    public int getPlayerId(){
+        return playerId;
+    }
+    
+    /**
+     * Sets the id of the associated player
+     * @param id The id of the associated player
+     */
+    public void setPlayerId(int id){
+        this.playerId = id;
+    }
     
     /**
      * Puts data on the character

src/main/java/electrosphere/server/physics/block/manager/ServerBlockChunkGenerationThread.java

@@ -164,7 +164,7 @@ public class ServerBlockChunkGenerationThread implements Runnable {
         }
         //check if this chunk intersects any macro data
         AABBd localAABB = new AABBd(ServerWorldData.convertChunkToRealSpace(worldX,worldY,worldZ),ServerWorldData.convertChunkToRealSpace(worldX+1,worldY+1,worldZ+1));
-        List<Structure> filtered = macroData.getStructures().stream().filter((Structure struct) -> {return struct.getAABB().testAABB(localAABB);}).collect(Collectors.toList());
+        List<Structure> filtered = macroData.getStructures().stream().filter((Structure struct) -> {return struct.isRepairable() || struct.getAABB().testAABB(localAABB);}).collect(Collectors.toList());
         if(filtered.size() > 0){
             Vector3i chunkPos = new Vector3i(worldX, worldY, worldZ);
             Vector3i blockPos = new Vector3i(0,0,0);

src/main/java/electrosphere/server/service/CharacterService.java

@@ -40,6 +40,11 @@ public class CharacterService extends SignalServiceImpl {
      */
     Map<Integer,Character> loadedCharacterMap = new HashMap<Integer,Character>();
 
+    /**
+     * Map of character -> entity
+     */
+    Map<Character,Entity> characterEntityMap = new HashMap<Character,Entity>();
+
     /**
      * Lock for thread-safe-ing the service
      */
@@ -63,6 +68,7 @@ public class CharacterService extends SignalServiceImpl {
         }
         lock.lock();
         Character toStore = new Character(template);
+        toStore.setPlayerId(playerId);
         DatabaseResult result = Globals.dbController.executePreparedQuery(
             "INSERT INTO charaData (playerId,dataVal) VALUES (?,?) RETURNING id;",
             playerId,
@@ -92,7 +98,7 @@ public class CharacterService extends SignalServiceImpl {
             return rVal;
         }
         Character charData = null;
-        DatabaseResult result = Globals.dbController.executePreparedQuery("SELECT id, dataVal FROM charaData WHERE id=?;", characterId);
+        DatabaseResult result = Globals.dbController.executePreparedQuery("SELECT id, playerId, dataVal FROM charaData WHERE id=?;", characterId);
         if(!result.hasResult()){
             LoggerInterface.loggerDB.WARNING("Failed to locate creature template for characterId=" + characterId);
             lock.unlock();
@@ -101,6 +107,7 @@ public class CharacterService extends SignalServiceImpl {
         for(DatabaseResultRow row : result){
             charData = SerializationUtils.deserialize(row.getAsString("dataVal"),Character.class);
             charData.setId(row.getAsInteger("id"));
+            charData.setPlayerId(row.getAsInteger("playerId"));
         }
         loadedCharacterMap.put(charData.getId(),charData);
         lock.unlock();
@@ -114,7 +121,7 @@ public class CharacterService extends SignalServiceImpl {
      */
     public List<Character> getCharacters(int playerId){
         lock.lock();
-        DatabaseResult result = Globals.dbController.executePreparedQuery("SELECT id, dataVal FROM charaData WHERE playerId=?;",playerId);
+        DatabaseResult result = Globals.dbController.executePreparedQuery("SELECT id, playerId, dataVal FROM charaData WHERE playerId=?;",playerId);
         List<Character> rVal = new LinkedList<Character>();
         if(result.hasResult()){
             //if we get a valid response from the database, check that it actually matches hashes
@@ -125,6 +132,7 @@ public class CharacterService extends SignalServiceImpl {
                 } else {
                     Character description = SerializationUtils.deserialize(row.getAsString("dataVal"),Character.class);
                     description.setId(id);
+                    description.setPlayerId(row.getAsInteger("playerId"));
                     loadedCharacterMap.put(description.getId(),description);
                     rVal.add(description);
                 }
@@ -166,7 +174,7 @@ public class CharacterService extends SignalServiceImpl {
      */
     public List<Character> getAllCharacters(){
         lock.lock();
-        DatabaseResult result = Globals.dbController.executePreparedQuery("SELECT id, dataVal FROM charaData");
+        DatabaseResult result = Globals.dbController.executePreparedQuery("SELECT id, playerId, dataVal FROM charaData");
         List<Character> rVal = new LinkedList<Character>();
         if(result.hasResult()){
             //if we get a valid response from the database, check that it actually matches hashes
@@ -177,6 +185,7 @@ public class CharacterService extends SignalServiceImpl {
                 } else {
                     Character description = SerializationUtils.deserialize(row.getAsString("dataVal"),Character.class);
                     description.setId(id);
+                    description.setPlayerId(row.getAsInteger("playerId"));
                     loadedCharacterMap.put(description.getId(),description);
                     rVal.add(description);
                 }
@@ -202,4 +211,41 @@ public class CharacterService extends SignalServiceImpl {
         return rVal;
     }
 
+    /**
+     * Associates an entity to a character
+     * @param character The character
+     * @param entity The entity
+     */
+    public void setEntity(Character character, Entity entity){
+        lock.lock();
+        if(this.characterEntityMap.containsKey(character)){
+            lock.unlock();
+            throw new Error("Entity already set!");
+        }
+        this.characterEntityMap.put(character, entity);
+        lock.unlock();
+    }
+
+    /**
+     * Gets the entity associated with a character
+     * @param character The character
+     * @return The associated entity if it exists, null otherwise
+     */
+    public Entity getEntity(Character character){
+        lock.lock();
+        Entity rVal = this.characterEntityMap.get(character);
+        lock.unlock();
+        return rVal;
+    }
+
+    /**
+     * Removes an entity association with a character
+     * @param character The character
+     */
+    public void removeEntity(Character character){
+        lock.lock();
+        this.characterEntityMap.remove(character);
+        lock.unlock();
+    }
+
 }

src/main/java/electrosphere/server/simulation/MacroSimulation.java

@@ -17,6 +17,8 @@ import electrosphere.server.macro.character.goal.CharacterGoal.CharacterGoalType
 import electrosphere.server.macro.structure.Structure;
 import electrosphere.server.macro.utils.StructurePlacementUtils;
 import electrosphere.server.macro.utils.StructureRepairUtils;
+import electrosphere.server.service.CharacterService;
+import electrosphere.server.simulation.chara.CharaInventoryUtils;
 import electrosphere.util.FileUtils;
 
 /**
@@ -36,6 +38,9 @@ public class MacroSimulation {
         List<Character> characters = Globals.characterService.getAllCharacters();
         if(characters != null && characters.size() > 0){
             for(Character character : Globals.characterService.getAllCharacters()){
+                if(character.getPlayerId() != CharacterService.NO_PLAYER){
+                    continue;
+                }
                 //do something
                 MacroSimulation.checkForShelter(realm, character);
                 MacroSimulation.checkTownMembership(character);
@@ -80,7 +85,11 @@ public class MacroSimulation {
             Structure shelter = CharacterUtils.getShelter(macroData,chara);
             if(shelter.isRepairable()){
                 String repairMat = StructureRepairUtils.getNextRepairMat(realm, shelter);
-                CharacterGoal.setCharacterGoal(chara, new CharacterGoal(CharacterGoalType.ACQUIRE_ITEM, repairMat));
+                if(CharaInventoryUtils.containsItem(chara, repairMat)){
+                    CharacterGoal.setCharacterGoal(chara, new CharacterGoal(CharacterGoalType.BUILD_STRUCTURE, shelter));
+                } else {
+                    CharacterGoal.setCharacterGoal(chara, new CharacterGoal(CharacterGoalType.ACQUIRE_ITEM, repairMat));
+                }
             }
             // Vector2i charPos = CharacterUtils.getDiscretePosition(chara);
             // Town nearbyTown = Town.getTownAtPosition(charPos.x,charPos.y);

src/main/java/electrosphere/server/simulation/chara/CharaInventoryUtils.java

@@ -0,0 +1,55 @@
+package electrosphere.server.simulation.chara;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import electrosphere.engine.Globals;
+import electrosphere.entity.Entity;
+import electrosphere.entity.types.creature.CreatureInventoryData;
+import electrosphere.entity.types.creature.CreatureTemplate;
+import electrosphere.entity.types.creature.CreatureUtils;
+import electrosphere.server.entity.serialization.EntitySerialization;
+import electrosphere.server.macro.character.Character;
+
+/**
+ * Checks if a character has an inventory item
+ */
+public class CharaInventoryUtils {
+    
+    /**
+     * Gets all items in the character's inventories
+     * @param chara The character
+     * @return The list of all items in the character's inventories
+     */
+    public static List<EntitySerialization> getInventoryContents(Character chara){
+        CreatureTemplate template = chara.getCreatureTemplate();
+        if(CharaMacroUtils.isMicroSim(chara)){
+            Entity creature = Globals.characterService.getEntity(chara);
+            template = CreatureUtils.getCreatureTemplate(creature);
+        }
+        CreatureInventoryData inventoryData = template.getInventoryData();
+        return inventoryData.getAllItems();
+    }
+
+    /**
+     * Gets the list of all inventory contents by their item ids
+     * @param chara The character
+     * @return The list of all item ids
+     */
+    public static List<String> getInventoryContentIds(Character chara){
+        return CharaInventoryUtils.getInventoryContents(chara).stream().map((EntitySerialization serialization) -> {
+            return serialization.getSubtype();
+        }).collect(Collectors.toList());
+    }
+
+    /**
+     * Checks if the character contains a given type of item
+     * @param chara The character
+     * @param itemId The item id
+     * @return true if the character contains that item type, false otherwise
+     */
+    public static boolean containsItem(Character chara, String itemId){
+        return CharaInventoryUtils.getInventoryContentIds(chara).contains(itemId);
+    }
+
+}

src/main/java/electrosphere/server/simulation/chara/CharaMacroUtils.java

@@ -0,0 +1,20 @@
+package electrosphere.server.simulation.chara;
+
+import electrosphere.engine.Globals;
+import electrosphere.server.macro.character.Character;
+
+/**
+ * Most basic utilities for working with characters in macro simulation
+ */
+public class CharaMacroUtils {
+    
+    /**
+     * Checks if a character is being handled by micro simulation
+     * @param chara The character
+     * @return true if it is being handled by micro simulation, false otherwise
+     */
+    public static boolean isMicroSim(Character chara){
+        return Globals.characterService.getEntity(chara) != null;
+    }
+
+}