bugfixes

assets/Data/entity/objects.json

@@ -2,7 +2,7 @@
     "objects" : [
 
         {
-            "objectId" : "crateWooden",
+            "id" : "crateWooden",
             "modelPath" : "Models/crate2.fbx",
             "tokens" : [
                 "GRAVITY",
@@ -25,9 +25,9 @@
 
     ],
     "files" : [
-        "Data/objects/floatingisland.json",
+        "Data/entity/objects/floatingisland.json",
-        "Data/objects/testscene1objects.json",
+        "Data/entity/objects/testscene1objects.json",
-        "Data/objects/debug_objects.json",
+        "Data/entity/objects/debug_objects.json",
-        "Data/objects/game_objects.json"
+        "Data/entity/objects/game_objects.json"
     ]
 }

assets/Data/entity/objects/debug_objects.json

@@ -2,7 +2,7 @@
     "objects" : [
 
         {
-            "objectId" : "hitboxTester",
+            "id" : "hitboxTester",
             "hitboxData" : [
                     {
                     "type": "static_capsule",

assets/Data/entity/objects/floatingisland.json

@@ -2,7 +2,7 @@
     "objects" : [
 
         {
-            "objectId" : "floatingisland1",
+            "id" : "floatingisland1",
             "modelPath" : "Models/floatingisland1.fbx",
             "tokens" : [
                 "DISABLE_COLLISION_REACTION",

assets/Data/entity/objects/game_objects.json

@@ -2,7 +2,7 @@
     "objects" : [
 
         {
-            "objectId" : "spawnPoint",
+            "id" : "spawnPoint",
             "modelPath" : "Models/gameobj/token.glb",
             "tokens": [
                 "SPAWNPOINT"

assets/Data/entity/objects/testscene1objects.json

@@ -2,7 +2,7 @@
     "objects" : [
 
         {
-            "objectId" : "terrain1",
+            "id" : "terrain1",
             "modelPath" : "Models/testvalley.fbx",
             "tokens" : [
                 "DISABLE_COLLISION_REACTION",
@@ -12,7 +12,7 @@
             "graphicsTemplate": null
         },
         {
-            "objectId" : "skyscraper1",
+            "id" : "skyscraper1",
             "modelPath" : "Models/skyscraper1.fbx",
             "tokens" : [
                 "DISABLE_COLLISION_REACTION",
@@ -22,7 +22,7 @@
             "graphicsTemplate": null
         },
         {
-            "objectId" : "smoke1",
+            "id" : "smoke1",
             "modelPath" : "Models/unitcube.fbx",
             "tokens" : [
                 "DRAW_TRANSPARENT_PASS"
@@ -42,7 +42,7 @@
             }
         },
         {
-            "objectId" : "geometrytest1",
+            "id" : "geometrytest1",
             "modelPath" : "Models/geometry1.fbx",
             "tokens" : [
                 "DISABLE_COLLISION_REACTION",

docs/src/progress/renderertodo.md

@@ -740,6 +740,8 @@ Rearch instanced actor
 ParticleService implementation
 Fix SSBO implementation misusing BufferUtils
 Massive entity spawning refactor to collapse entity type permutations
+Move AttachUtils package
+Move Scene package
 
 
 # TODO

src/main/java/electrosphere/client/scene/ClientSceneWrapper.java

@@ -14,7 +14,7 @@ import electrosphere.collision.hitbox.HitboxManager;
 import electrosphere.collision.hitbox.HitboxUtils;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
-import electrosphere.entity.Scene;
+import electrosphere.entity.scene.Scene;
 import electrosphere.logger.LoggerInterface;
 
 /**

src/main/java/electrosphere/client/sim/ClientSimulation.java

@@ -11,9 +11,9 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.collidable.ClientCollidableTree;
 import electrosphere.entity.state.equip.ClientEquipState;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.renderer.actor.Actor;

src/main/java/electrosphere/collision/hitbox/HitboxUtils.java

@@ -3,7 +3,7 @@ package electrosphere.collision.hitbox;
 import electrosphere.collision.collidable.Collidable;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
-import electrosphere.entity.types.attach.AttachUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxType;

src/main/java/electrosphere/engine/Globals.java

@@ -40,7 +40,7 @@ import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.engine.threads.ThreadManager;
 import electrosphere.engine.time.Timekeeper;
 import electrosphere.entity.Entity;
-import electrosphere.entity.Scene;
+import electrosphere.entity.scene.Scene;
 import electrosphere.game.config.UserSettings;
 import electrosphere.game.data.particle.ParticleDefinition;
 import electrosphere.game.data.voxel.VoxelType;

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

@@ -5,8 +5,8 @@ import java.util.List;
 import org.joml.Vector3d;
 
 import electrosphere.engine.Globals;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.net.parser.net.message.EntityMessage;
 import electrosphere.server.datacell.Realm;

src/main/java/electrosphere/entity/scene/Scene.java

@@ -1,8 +1,10 @@
-package electrosphere.entity;
+package electrosphere.entity.scene;
 
 import electrosphere.engine.Globals;
+import electrosphere.entity.Entity;
+import electrosphere.entity.EntityTags;
 import electrosphere.entity.btree.BehaviorTree;
-import electrosphere.entity.types.attach.AttachUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.logger.LoggerInterface;
 
 import java.util.List;

src/main/java/electrosphere/entity/state/attach/AttachUtils.java

@@ -1,4 +1,4 @@
-package electrosphere.entity.types.attach;
+package electrosphere.entity.state.attach;
 
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;

src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java

@@ -7,13 +7,13 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.btree.StateTransitionUtil;
 import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.state.movement.fall.ClientFallTree;
 import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.rotator.RotatorTree;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;

src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java

@@ -12,6 +12,7 @@ import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.btree.StateTransitionUtil;
 import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeDriftState;
 import electrosphere.entity.state.attack.ClientAttackTree.AttackTreeState;
 import electrosphere.entity.state.collidable.Impulse;
@@ -20,7 +21,6 @@ import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.state.movement.fall.ServerFallTree;
 import electrosphere.entity.state.movement.jump.ServerJumpTree;
 import electrosphere.entity.state.rotator.ServerRotatorTree;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.collision.CollisionObjUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;

src/main/java/electrosphere/entity/state/block/ServerBlockTree.java

@@ -13,9 +13,9 @@ import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils;
 import electrosphere.net.parser.net.message.SynchronizationMessage;
 
 import electrosphere.server.datacell.utils.DataCellSearchUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.block.ClientBlockTree.BlockState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.game.data.creature.type.block.BlockSystem;
 import electrosphere.game.data.creature.type.block.BlockVariant;
 import electrosphere.net.synchronization.annotation.SyncedField;

src/main/java/electrosphere/entity/state/equip/ClientEquipState.java

@@ -14,9 +14,9 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.entity.state.gravity.GravityUtils;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.common.treedata.TreeDataAnimation;

src/main/java/electrosphere/entity/state/equip/ServerEquipState.java

@@ -18,12 +18,12 @@ import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.ServerEntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.block.ServerBlockTree;
 import electrosphere.entity.state.gravity.GravityUtils;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.game.data.common.treedata.TreeDataAnimation;

src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java

@@ -21,8 +21,8 @@ import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState.HitboxShapeType;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.game.data.collidable.HitboxData;
 import electrosphere.game.data.utils.DataFormatUtil;
 import electrosphere.logger.LoggerInterface;

src/main/java/electrosphere/entity/types/item/ItemUtils.java

@@ -16,10 +16,10 @@ import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.ServerEntityUtils;
 import electrosphere.entity.state.AnimationPriorities;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.gravity.ServerGravityTree;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.types.EntityTypes.EntityType;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.game.data.item.type.EquipData;
 import electrosphere.game.data.item.type.EquipWhitelist;

src/main/java/electrosphere/entity/types/tree/ProceduralTree.java

@@ -27,7 +27,7 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
-import electrosphere.entity.types.attach.AttachUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.game.data.foliage.type.TreeModel;
 import electrosphere.renderer.actor.instance.InstancedActor;

src/main/java/electrosphere/menu/debug/ImGuiEntityMacros.java

@@ -13,10 +13,10 @@ import electrosphere.collision.PhysicsEntityUtils;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.state.server.ServerPlayerViewDirTree;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.foliage.FoliageUtils;
 import electrosphere.entity.types.item.ItemUtils;

src/main/java/electrosphere/net/client/protocol/EntityProtocol.java

@@ -10,12 +10,12 @@ import electrosphere.engine.Globals;
 import electrosphere.entity.ClientEntityUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.physicssync.ClientPhysicsSyncTree;
 import electrosphere.entity.types.EntityTypes;
 import electrosphere.entity.types.EntityTypes.EntityType;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.creature.CreatureEquipData.EquippedItem;
 import electrosphere.entity.types.creature.CreatureTemplate;
@@ -242,7 +242,7 @@ public class EntityProtocol implements ClientProtocolTemplate<EntityMessage> {
     static Entity spawnItem(EntityMessage message){
         LoggerInterface.loggerNetworking.DEBUG("[CLIENT] Spawn Item " + message.getentityID() + " at " + message.getpositionX() + " " + message.getpositionY() + " " + message.getpositionZ());
         //spawn item
-        String itemType = message.getcreatureTemplate();
+        String itemType = message.getentitySubtype();
         Entity newlySpawnedEntity = ItemUtils.clientSpawnBasicItem(itemType);
         //position
         ClientEntityUtils.initiallyPositionEntity(
@@ -280,7 +280,7 @@ public class EntityProtocol implements ClientProtocolTemplate<EntityMessage> {
     static Entity spawnCommon(EntityMessage message){
         LoggerInterface.loggerNetworking.DEBUG("[CLIENT] Spawn object " + message.getentityID() + " at " + message.getpositionX() + " " + message.getpositionY() + " " + message.getpositionZ());
         //spawn item
-        String objectType = message.getcreatureTemplate();
+        String objectType = message.getentitySubtype();
         Entity newlySpawnedEntity = CommonEntityUtils.clientSpawnBasicObject(objectType);
         //position
         ClientEntityUtils.initiallyPositionEntity(

src/main/java/electrosphere/renderer/pipelines/FirstPersonItemsPipeline.java

@@ -11,9 +11,9 @@ import electrosphere.client.entity.camera.CameraEntityUtils;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.client.firstPerson.FirstPersonTree;
 import electrosphere.entity.state.equip.ClientEquipState;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.renderer.OpenGLState;
 import electrosphere.renderer.RenderPipelineState;
 import electrosphere.renderer.actor.Actor;

src/main/java/electrosphere/renderer/pipelines/MainContentPipeline.java

@@ -14,7 +14,7 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
-import electrosphere.entity.types.attach.AttachUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.renderer.OpenGLState;
 import electrosphere.renderer.RenderPipelineState;
 import electrosphere.renderer.RenderingEngine;

src/main/java/electrosphere/server/collision/ServerHitboxResolutionCallback.java

@@ -7,12 +7,12 @@ import org.ode4j.ode.DGeom;
 import electrosphere.collision.CollisionEngine.CollisionResolutionCallback;
 import electrosphere.collision.collidable.Collidable;
 import electrosphere.entity.Entity;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.attack.ServerAttackTree;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxType;
 import electrosphere.entity.state.life.ServerLifeTree;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.logger.LoggerInterface;
 

src/main/java/electrosphere/server/datacell/Realm.java

@@ -4,7 +4,7 @@ import electrosphere.collision.CollisionEngine;
 import electrosphere.collision.hitbox.HitboxManager;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
-import electrosphere.entity.Scene;
+import electrosphere.entity.scene.Scene;
 import electrosphere.game.server.world.ServerWorldData;
 import electrosphere.net.parser.net.message.NetworkMessage;
 import electrosphere.script.ScriptEngine;

src/main/java/electrosphere/server/datacell/ServerDataCell.java

@@ -2,7 +2,7 @@ package electrosphere.server.datacell;
 
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
-import electrosphere.entity.Scene;
+import electrosphere.entity.scene.Scene;
 import electrosphere.entity.types.EntityTypes.EntityType;
 import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;

src/main/java/electrosphere/server/datacell/ViewportDataCellManager.java

@@ -7,7 +7,7 @@ import org.joml.Vector3d;
 import org.joml.Vector3i;
 
 import electrosphere.engine.Globals;
-import electrosphere.entity.Scene;
+import electrosphere.entity.scene.Scene;
 import electrosphere.net.server.player.Player;
 import electrosphere.server.datacell.interfaces.DataCellManager;
 

src/main/java/electrosphere/server/saves/Save.java

@@ -2,7 +2,7 @@ package electrosphere.server.saves;
 
 import java.util.List;
 
-import electrosphere.entity.Scene;
+import electrosphere.entity.scene.Scene;
 
 /**
  * Top level save object that stores information about the save

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

@@ -1,13 +1,12 @@
 package electrosphere.server.simulation;
 
-import electrosphere.entity.types.attach.AttachUtils;
-
 import java.util.Set;
 
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.collidable.ServerCollidableTree;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.server.datacell.ServerDataCell;

src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java

@@ -12,9 +12,9 @@ import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityTags;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;

src/test/java/electrosphere/entity/state/equip/ServerEquipStateTests.java

@@ -11,8 +11,8 @@ import org.joml.Vector3d;
 import electrosphere.test.annotations.IntegrationTest;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
+import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.state.inventory.InventoryUtils;
-import electrosphere.entity.types.attach.AttachUtils;
 import electrosphere.entity.types.creature.CreatureTemplate;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;

src/test/java/electrosphere/entity/types/attach/AttachUtilsUnitTests.java

@@ -7,6 +7,7 @@ import electrosphere.test.annotations.UnitTest;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityDataStrings;
+import electrosphere.entity.state.attach.AttachUtils;
 
 /**
  * Unit tests for attach utils