From bf8e54e991fa03774e8b080aef4bd08cff738117 Mon Sep 17 00:00:00 2001 From: austin Date: Sun, 18 May 2025 12:45:03 -0400 Subject: [PATCH] shuffle data packages --- docs/src/progress/renderertodo.md | 1 + .../audio/collision/HitboxAudioService.java | 2 +- .../electrosphere/client/ClientState.java | 2 +- .../ClientNetworkHitboxCollision.java | 2 +- .../entity/camera/CameraEntityUtils.java | 2 +- .../entity/particle/ParticleService.java | 2 +- .../client/entity/particle/ParticleUtils.java | 2 +- .../client/interact/ButtonInteraction.java | 2 +- .../interact/ClientInteractionEngine.java | 2 +- .../client/interact/ItemActions.java | 2 +- .../terrain/foliage/FoliageCellManager.java | 2 +- .../client/terrain/foliage/FoliageModel.java | 2 +- .../ui/components/CharacterCustomizer.java | 6 +-- .../components/EquipmentInventoryPanel.java | 4 +- .../client/ui/components/ItemIconPanel.java | 2 +- .../ui/components/NaturalInventoryPanel.java | 2 +- .../ui/components/SpawnSelectionPanel.java | 2 +- .../ui/components/ToolbarInventoryPanel.java | 2 +- .../components/imgui/CollidableEditBlock.java | 2 +- .../menu/debug/entity/ImGuiEntityMacros.java | 4 +- .../entity/tabs/ImGuiEntityActorTab.java | 8 +-- .../entity/tabs/ImGuiEntityFoliageTab.java | 4 +- .../entity/tabs/ImGuiEntityFurnitureTab.java | 4 +- .../entity/tabs/ImGuiEntityHitboxTab.java | 2 +- .../tabs/ImGuiEntityInteractionTab.java | 2 +- .../entity/tabs/ImGuiEntityPhysicsTab.java | 2 +- .../ui/menu/ingame/MenuGeneratorsInGame.java | 4 +- .../menu/ingame/MenuGeneratorsInventory.java | 2 +- .../ingame/MenuGeneratorsLevelEditor.java | 8 +-- .../ingame/MenuGeneratorsTerrainEditing.java | 2 +- .../mainmenu/MenuGeneratorsUITesting.java | 4 +- .../menu/script/ScriptLevelEditorUtils.java | 6 +-- .../collision/CollisionEngine.java | 4 +- .../collision/PhysicsEntityUtils.java | 2 +- .../electrosphere/collision/PhysicsUtils.java | 2 +- .../collision/hitbox/HitboxUtils.java | 2 +- .../categories/ControlCategoryMainGame.java | 2 +- .../controls/cursor/CursorState.java | 4 +- src/main/java/electrosphere/data/Config.java | 26 ++++----- .../electrosphere/data/ConfigValidator.java | 10 ++-- .../data/crafting/RecipeData.java | 2 +- .../collidable/CollidableTemplate.java | 2 +- .../{ => entity}/collidable/HitboxData.java | 2 +- .../common/CommonEntityLoader.java | 2 +- .../{ => entity}/common/CommonEntityMap.java | 2 +- .../common/CommonEntityTokens.java | 2 +- .../{ => entity}/common/CommonEntityType.java | 54 +++++++++---------- .../common/CommonEntityValidator.java | 6 +-- .../common/camera/CameraData.java | 2 +- .../common/interact/InteractionData.java | 4 +- .../common/item/InventoryDescription.java | 2 +- .../common/item/SpawnItemDescription.java | 4 +- .../common/life/HealthSystem.java | 6 +-- .../common/life/loot/LootPool.java | 2 +- .../common/life/loot/LootTicket.java | 2 +- .../common/light/PointLightDescription.java | 2 +- .../common/treedata/TreeDataAnimation.java | 2 +- .../common/treedata/TreeDataAudio.java | 2 +- .../common/treedata/TreeDataState.java | 2 +- .../{ => entity}/creature/CreatureData.java | 6 +-- .../creature/CreatureDataValidator.java | 18 +++---- .../creature/CreatureTypeLoader.java | 2 +- .../creature/CreatureTypeMap.java | 2 +- .../data/{ => entity}/creature/IdleData.java | 4 +- .../{ => entity}/creature/LookAtSystem.java | 2 +- .../{ => entity}/creature/SprintSystem.java | 4 +- .../{ => entity}/creature/ViewModelData.java | 2 +- .../{ => entity}/creature/ai/AITreeData.java | 2 +- .../creature/ai/AITreeDataSerializer.java | 2 +- .../creature/ai/AttackerTreeData.java | 2 +- .../creature/ai/BlockerTreeData.java | 2 +- .../creature/ai/MaslowTreeData.java | 2 +- .../ai/StandardCharacterTreeData.java | 2 +- .../creature/attack/AttackMove.java | 4 +- .../creature/attack/AttackMoveResolver.java | 2 +- .../creature/block/BlockSystem.java | 2 +- .../creature/block/BlockVariant.java | 6 +-- .../creature/block/VariantDefaults.java | 2 +- .../creature/bonegroups/BoneGroup.java | 2 +- .../creature/equip/EquipPoint.java | 4 +- .../creature/equip/ToolbarData.java | 2 +- .../movement/AirplaneMovementSystem.java | 2 +- .../movement/EditorMovementSystem.java | 2 +- .../creature/movement/FallMovementSystem.java | 4 +- .../movement/GroundMovementSystem.java | 6 +-- .../creature/movement/JumpMovementSystem.java | 4 +- .../creature/movement/MovementSystem.java | 2 +- .../movement/MovementSystemSerializer.java | 2 +- .../creature/movement/WalkMovementSystem.java | 2 +- .../creature/rotator/RotatorConstraint.java | 2 +- .../creature/rotator/RotatorItem.java | 2 +- .../creature/rotator/RotatorSystem.java | 2 +- .../visualattribute/AttributeVariant.java | 2 +- .../visualattribute/VisualAttribute.java | 2 +- .../{ => entity}/foliage/AmbientAudio.java | 2 +- .../{ => entity}/foliage/FoliageType.java | 4 +- .../foliage/FoliageTypeLoader.java | 2 +- .../{ => entity}/foliage/FoliageTypeMap.java | 2 +- .../data/{ => entity}/foliage/GrassData.java | 2 +- .../data/{ => entity}/foliage/GrowthData.java | 4 +- .../{ => entity}/foliage/GrowthModel.java | 2 +- .../{ => entity}/foliage/PhysicsObject.java | 2 +- .../foliage/ProceduralTreeBranchModel.java | 2 +- .../foliage/ProceduralTreeTrunkModel.java | 2 +- .../data/{ => entity}/foliage/TreeModel.java | 4 +- .../data/{ => entity}/furniture/DoorData.java | 4 +- .../{ => entity}/furniture/FurnitureData.java | 2 +- .../graphics/GraphicsTemplate.java | 2 +- .../graphics/NonproceduralModel.java | 4 +- .../graphics/ProceduralModel.java | 4 +- .../data/{ => entity}/graphics/ShaderSet.java | 2 +- .../{ => entity}/grident/GridAlignedData.java | 2 +- .../data/{ => entity}/item/EquipData.java | 2 +- .../{ => entity}/item/EquipWhitelist.java | 2 +- .../data/{ => entity}/item/Item.java | 10 ++-- .../data/{ => entity}/item/ItemAudio.java | 2 +- .../data/{ => entity}/item/ItemDataFile.java | 2 +- .../data/{ => entity}/item/ItemDataMap.java | 6 +-- .../data/{ => entity}/item/ItemFabData.java | 2 +- .../data/{ => entity}/item/ItemIdStrings.java | 2 +- .../data/{ => entity}/item/ItemUsage.java | 2 +- .../data/{ => entity}/item/WeaponData.java | 4 +- .../item/source/ItemSourcingData.java | 6 +-- .../item/source/ItemSourcingMap.java | 18 +++---- .../item/source/ItemSourcingTree.java | 6 +-- .../{ => entity}/particle/ParticleData.java | 2 +- .../particle/ParticleDefinition.java | 2 +- .../particle/ParticleEmitter.java | 2 +- .../projectile/ProjectileType.java | 2 +- .../projectile/ProjectileTypeHolder.java | 2 +- .../data/units/UnitDefinition.java | 2 +- .../loadingthreads/InitialAssetLoading.java | 2 +- .../engine/loadingthreads/LoadingUtils.java | 4 +- .../entity/btree/StateTransitionUtil.java | 6 +-- .../entity/state/attack/ClientAttackTree.java | 6 +-- .../entity/state/attack/ServerAttackTree.java | 8 +-- .../entity/state/block/ClientBlockTree.java | 4 +- .../entity/state/block/ServerBlockTree.java | 4 +- .../ambientaudio/ClientAmbientAudioTree.java | 2 +- .../client/firstPerson/FirstPersonTree.java | 2 +- .../ClientParticleEmitterComponent.java | 4 +- .../client/particle/ClientParticleTree.java | 4 +- .../entity/state/equip/ClientEquipState.java | 8 +-- .../state/equip/ClientToolbarState.java | 10 ++-- .../entity/state/equip/ServerEquipState.java | 10 ++-- .../state/equip/ServerToolbarState.java | 10 ++-- .../state/furniture/ClientDoorState.java | 2 +- .../state/furniture/ServerDoorState.java | 2 +- .../state/growth/ClientGrowthComponent.java | 2 +- .../state/growth/ServerGrowthComponent.java | 2 +- .../state/hitbox/HitboxCollectionState.java | 2 +- .../entity/state/idle/ClientIdleTree.java | 2 +- .../entity/state/idle/ServerIdleTree.java | 2 +- .../state/inventory/ClientInventoryState.java | 4 +- .../inventory/RelationalInventoryState.java | 2 +- .../state/inventory/ServerInventoryState.java | 4 +- .../entity/state/life/ClientLifeTree.java | 2 +- .../entity/state/life/ServerLifeTree.java | 8 +-- .../light/ClientPointLightComponent.java | 2 +- .../editor/ClientEditorMovementTree.java | 2 +- .../editor/ServerEditorMovementTree.java | 2 +- .../state/movement/fall/ClientFallTree.java | 2 +- .../state/movement/fall/ServerFallTree.java | 4 +- .../groundmove/ClientGroundMovementTree.java | 2 +- .../groundmove/ServerGroundMovementTree.java | 2 +- .../state/movement/jump/ClientJumpTree.java | 2 +- .../state/movement/jump/ServerJumpTree.java | 2 +- .../movement/sprint/ClientSprintTree.java | 2 +- .../movement/sprint/ServerSprintTree.java | 2 +- .../state/movement/walk/ClientWalkTree.java | 2 +- .../state/movement/walk/ServerWalkTree.java | 2 +- .../state/rotator/RotatorConstraint.java | 2 +- .../types/common/CommonEntityUtils.java | 34 ++++++------ .../entity/types/creature/CreatureUtils.java | 6 +-- .../entity/types/creature/ObjectTemplate.java | 4 +- .../entity/types/foliage/FoliageUtils.java | 4 +- .../entity/types/item/ItemUtils.java | 10 ++-- .../types/projectile/ProjectileUtils.java | 4 +- .../entity/types/tree/ProceduralTree.java | 8 +-- .../net/client/protocol/EntityProtocol.java | 4 +- .../server/protocol/CharacterProtocol.java | 4 +- .../electrosphere/renderer/actor/Actor.java | 4 +- .../renderer/light/LightManager.java | 2 +- .../renderer/light/PointLight.java | 2 +- .../pipelines/debug/DebugContentPipeline.java | 8 +-- src/main/java/electrosphere/server/ai/AI.java | 8 +-- .../electrosphere/server/ai/AIManager.java | 2 +- .../actions/combat/MeleeRangeCheckNode.java | 2 +- .../ai/nodes/actions/interact/CraftNode.java | 2 +- .../checks/inventory/SourcingTypeNode.java | 4 +- .../ai/nodes/plan/SolveSourcingTreeNode.java | 4 +- .../nodes/solvers/SolveBuildMaterialNode.java | 2 +- .../character/StandardCharacterTree.java | 2 +- .../ai/trees/creature/AttackerAITree.java | 2 +- .../ai/trees/creature/melee/MeleeAITree.java | 2 +- .../creature/resource/AcquireItemTree.java | 2 +- .../ai/trees/creature/resource/FellTree.java | 2 +- .../server/ai/trees/test/BlockerAITree.java | 2 +- .../server/entity/poseactor/PoseActor.java | 4 +- .../macro/utils/StructureRepairUtils.java | 2 +- .../terrain/editing/TerrainEditing.java | 2 +- .../server/player/BlockActions.java | 2 +- .../server/player/CraftingActions.java | 4 +- .../server/player/PlayerActions.java | 10 ++-- .../java/electrosphere/util/FileUtils.java | 8 +-- .../util/SerializationUtils.java | 8 +-- .../entity/SpawnAllEntitiesTests.java | 16 +++--- .../entity/types/item/ItemUtilsTests.java | 2 +- 208 files changed, 410 insertions(+), 409 deletions(-) rename src/main/java/electrosphere/data/{ => entity}/collidable/CollidableTemplate.java (99%) rename src/main/java/electrosphere/data/{ => entity}/collidable/HitboxData.java (99%) rename src/main/java/electrosphere/data/{ => entity}/common/CommonEntityLoader.java (93%) rename src/main/java/electrosphere/data/{ => entity}/common/CommonEntityMap.java (96%) rename src/main/java/electrosphere/data/{ => entity}/common/CommonEntityTokens.java (90%) rename src/main/java/electrosphere/data/{ => entity}/common/CommonEntityType.java (86%) rename src/main/java/electrosphere/data/{ => entity}/common/CommonEntityValidator.java (89%) rename src/main/java/electrosphere/data/{ => entity}/common/camera/CameraData.java (94%) rename src/main/java/electrosphere/data/{ => entity}/common/interact/InteractionData.java (94%) rename src/main/java/electrosphere/data/{ => entity}/common/item/InventoryDescription.java (88%) rename src/main/java/electrosphere/data/{ => entity}/common/item/SpawnItemDescription.java (91%) rename src/main/java/electrosphere/data/{ => entity}/common/life/HealthSystem.java (86%) rename src/main/java/electrosphere/data/{ => entity}/common/life/loot/LootPool.java (92%) rename src/main/java/electrosphere/data/{ => entity}/common/life/loot/LootTicket.java (97%) rename src/main/java/electrosphere/data/{ => entity}/common/light/PointLightDescription.java (98%) rename src/main/java/electrosphere/data/{ => entity}/common/treedata/TreeDataAnimation.java (97%) rename src/main/java/electrosphere/data/{ => entity}/common/treedata/TreeDataAudio.java (86%) rename src/main/java/electrosphere/data/{ => entity}/common/treedata/TreeDataState.java (92%) rename src/main/java/electrosphere/data/{ => entity}/creature/CreatureData.java (74%) rename src/main/java/electrosphere/data/{ => entity}/creature/CreatureDataValidator.java (90%) rename src/main/java/electrosphere/data/{ => entity}/creature/CreatureTypeLoader.java (98%) rename src/main/java/electrosphere/data/{ => entity}/creature/CreatureTypeMap.java (86%) rename src/main/java/electrosphere/data/{ => entity}/creature/IdleData.java (77%) rename src/main/java/electrosphere/data/{ => entity}/creature/LookAtSystem.java (91%) rename src/main/java/electrosphere/data/{ => entity}/creature/SprintSystem.java (93%) rename src/main/java/electrosphere/data/{ => entity}/creature/ViewModelData.java (96%) rename src/main/java/electrosphere/data/{ => entity}/creature/ai/AITreeData.java (78%) rename src/main/java/electrosphere/data/{ => entity}/creature/ai/AITreeDataSerializer.java (97%) rename src/main/java/electrosphere/data/{ => entity}/creature/ai/AttackerTreeData.java (94%) rename src/main/java/electrosphere/data/{ => entity}/creature/ai/BlockerTreeData.java (84%) rename src/main/java/electrosphere/data/{ => entity}/creature/ai/MaslowTreeData.java (87%) rename src/main/java/electrosphere/data/{ => entity}/creature/ai/StandardCharacterTreeData.java (88%) rename src/main/java/electrosphere/data/{ => entity}/creature/attack/AttackMove.java (97%) rename src/main/java/electrosphere/data/{ => entity}/creature/attack/AttackMoveResolver.java (98%) rename src/main/java/electrosphere/data/{ => entity}/creature/block/BlockSystem.java (97%) rename src/main/java/electrosphere/data/{ => entity}/creature/block/BlockVariant.java (92%) rename src/main/java/electrosphere/data/{ => entity}/creature/block/VariantDefaults.java (93%) rename src/main/java/electrosphere/data/{ => entity}/creature/bonegroups/BoneGroup.java (95%) rename src/main/java/electrosphere/data/{ => entity}/creature/equip/EquipPoint.java (98%) rename src/main/java/electrosphere/data/{ => entity}/creature/equip/ToolbarData.java (92%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/AirplaneMovementSystem.java (92%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/EditorMovementSystem.java (88%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/FallMovementSystem.java (87%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/GroundMovementSystem.java (94%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/JumpMovementSystem.java (90%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/MovementSystem.java (57%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/MovementSystemSerializer.java (96%) rename src/main/java/electrosphere/data/{ => entity}/creature/movement/WalkMovementSystem.java (90%) rename src/main/java/electrosphere/data/{ => entity}/creature/rotator/RotatorConstraint.java (91%) rename src/main/java/electrosphere/data/{ => entity}/creature/rotator/RotatorItem.java (83%) rename src/main/java/electrosphere/data/{ => entity}/creature/rotator/RotatorSystem.java (77%) rename src/main/java/electrosphere/data/{ => entity}/creature/visualattribute/AttributeVariant.java (83%) rename src/main/java/electrosphere/data/{ => entity}/creature/visualattribute/VisualAttribute.java (95%) rename src/main/java/electrosphere/data/{ => entity}/foliage/AmbientAudio.java (97%) rename src/main/java/electrosphere/data/{ => entity}/foliage/FoliageType.java (90%) rename src/main/java/electrosphere/data/{ => entity}/foliage/FoliageTypeLoader.java (96%) rename src/main/java/electrosphere/data/{ => entity}/foliage/FoliageTypeMap.java (95%) rename src/main/java/electrosphere/data/{ => entity}/foliage/GrassData.java (97%) rename src/main/java/electrosphere/data/{ => entity}/foliage/GrowthData.java (89%) rename src/main/java/electrosphere/data/{ => entity}/foliage/GrowthModel.java (88%) rename src/main/java/electrosphere/data/{ => entity}/foliage/PhysicsObject.java (94%) rename src/main/java/electrosphere/data/{ => entity}/foliage/ProceduralTreeBranchModel.java (98%) rename src/main/java/electrosphere/data/{ => entity}/foliage/ProceduralTreeTrunkModel.java (97%) rename src/main/java/electrosphere/data/{ => entity}/foliage/TreeModel.java (98%) rename src/main/java/electrosphere/data/{ => entity}/furniture/DoorData.java (92%) rename src/main/java/electrosphere/data/{ => entity}/furniture/FurnitureData.java (87%) rename src/main/java/electrosphere/data/{ => entity}/graphics/GraphicsTemplate.java (95%) rename src/main/java/electrosphere/data/{ => entity}/graphics/NonproceduralModel.java (95%) rename src/main/java/electrosphere/data/{ => entity}/graphics/ProceduralModel.java (79%) rename src/main/java/electrosphere/data/{ => entity}/graphics/ShaderSet.java (87%) rename src/main/java/electrosphere/data/{ => entity}/grident/GridAlignedData.java (97%) rename src/main/java/electrosphere/data/{ => entity}/item/EquipData.java (96%) rename src/main/java/electrosphere/data/{ => entity}/item/EquipWhitelist.java (91%) rename src/main/java/electrosphere/data/{ => entity}/item/Item.java (97%) rename src/main/java/electrosphere/data/{ => entity}/item/ItemAudio.java (94%) rename src/main/java/electrosphere/data/{ => entity}/item/ItemDataFile.java (96%) rename src/main/java/electrosphere/data/{ => entity}/item/ItemDataMap.java (97%) rename src/main/java/electrosphere/data/{ => entity}/item/ItemFabData.java (93%) rename src/main/java/electrosphere/data/{ => entity}/item/ItemIdStrings.java (81%) rename src/main/java/electrosphere/data/{ => entity}/item/ItemUsage.java (98%) rename src/main/java/electrosphere/data/{ => entity}/item/WeaponData.java (94%) rename src/main/java/electrosphere/data/{ => entity}/item/source/ItemSourcingData.java (93%) rename src/main/java/electrosphere/data/{ => entity}/item/source/ItemSourcingMap.java (90%) rename src/main/java/electrosphere/data/{ => entity}/item/source/ItemSourcingTree.java (97%) rename src/main/java/electrosphere/data/{ => entity}/particle/ParticleData.java (98%) rename src/main/java/electrosphere/data/{ => entity}/particle/ParticleDefinition.java (88%) rename src/main/java/electrosphere/data/{ => entity}/particle/ParticleEmitter.java (99%) rename src/main/java/electrosphere/data/{ => entity}/projectile/ProjectileType.java (92%) rename src/main/java/electrosphere/data/{ => entity}/projectile/ProjectileTypeHolder.java (91%) diff --git a/docs/src/progress/renderertodo.md b/docs/src/progress/renderertodo.md index 7ffb29d9..3dbac8bb 100644 --- a/docs/src/progress/renderertodo.md +++ b/docs/src/progress/renderertodo.md @@ -1868,6 +1868,7 @@ Editor structure tab uses file dialog to save fabs Config saving Structure data saving Validate race data +Shuffle entity data package diff --git a/src/main/java/electrosphere/audio/collision/HitboxAudioService.java b/src/main/java/electrosphere/audio/collision/HitboxAudioService.java index 2c850a46..db96b3d0 100644 --- a/src/main/java/electrosphere/audio/collision/HitboxAudioService.java +++ b/src/main/java/electrosphere/audio/collision/HitboxAudioService.java @@ -5,7 +5,7 @@ import java.util.Random; import org.joml.Vector3d; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.HitboxData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.types.creature.CreatureUtils; diff --git a/src/main/java/electrosphere/client/ClientState.java b/src/main/java/electrosphere/client/ClientState.java index 98af799d..125a26d1 100644 --- a/src/main/java/electrosphere/client/ClientState.java +++ b/src/main/java/electrosphere/client/ClientState.java @@ -19,7 +19,7 @@ import electrosphere.client.terrain.cells.ClientDrawCellManager; import electrosphere.client.terrain.foliage.FoliageCellManager; import electrosphere.client.terrain.manager.ClientTerrainManager; import electrosphere.collision.CollisionEngine; -import electrosphere.data.common.CommonEntityType; +import electrosphere.data.entity.common.CommonEntityType; import electrosphere.data.voxel.VoxelType; import electrosphere.entity.Entity; import electrosphere.entity.scene.Scene; diff --git a/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java b/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java index 84509a9e..cd29673b 100644 --- a/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java +++ b/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java @@ -2,7 +2,7 @@ package electrosphere.client.collision; import org.joml.Vector3d; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.HitboxData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.types.creature.CreatureUtils; diff --git a/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java b/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java index 07c53424..35e3877d 100644 --- a/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java +++ b/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java @@ -1,6 +1,6 @@ package electrosphere.client.entity.camera; -import electrosphere.data.common.CommonEntityType; +import electrosphere.data.entity.common.CommonEntityType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; diff --git a/src/main/java/electrosphere/client/entity/particle/ParticleService.java b/src/main/java/electrosphere/client/entity/particle/ParticleService.java index 5095945c..a2c03447 100644 --- a/src/main/java/electrosphere/client/entity/particle/ParticleService.java +++ b/src/main/java/electrosphere/client/entity/particle/ParticleService.java @@ -8,7 +8,7 @@ import org.joml.Vector3d; import electrosphere.client.entity.instance.InstanceTemplate; import electrosphere.client.entity.instance.InstancedEntityUtils; -import electrosphere.data.particle.ParticleData; +import electrosphere.data.entity.particle.ParticleData; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.signal.Signal; import electrosphere.engine.signal.Signal.SignalType; diff --git a/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java b/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java index a15a8062..86070f68 100644 --- a/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java +++ b/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java @@ -1,6 +1,6 @@ package electrosphere.client.entity.particle; -import electrosphere.data.particle.ParticleData; +import electrosphere.data.entity.particle.ParticleData; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.DrawableUtils; diff --git a/src/main/java/electrosphere/client/interact/ButtonInteraction.java b/src/main/java/electrosphere/client/interact/ButtonInteraction.java index 6e285f4d..2ac4648b 100644 --- a/src/main/java/electrosphere/client/interact/ButtonInteraction.java +++ b/src/main/java/electrosphere/client/interact/ButtonInteraction.java @@ -7,7 +7,7 @@ import electrosphere.client.entity.crosshair.Crosshair; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.client.ui.menu.dialog.DialogMenuGenerator; import electrosphere.client.ui.menu.ingame.InventoryMainWindow; -import electrosphere.data.common.interact.InteractionData; +import electrosphere.data.entity.common.interact.InteractionData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.equip.ClientEquipState; diff --git a/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java b/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java index dd289931..c413bcb9 100644 --- a/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java +++ b/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java @@ -19,7 +19,7 @@ import electrosphere.collision.CollisionBodyCreation; import electrosphere.collision.CollisionEngine; import electrosphere.collision.PhysicsUtils; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/client/interact/ItemActions.java b/src/main/java/electrosphere/client/interact/ItemActions.java index fd030003..5f8b721c 100644 --- a/src/main/java/electrosphere/client/interact/ItemActions.java +++ b/src/main/java/electrosphere/client/interact/ItemActions.java @@ -7,7 +7,7 @@ import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.client.script.ClientScriptUtils; import electrosphere.client.terrain.editing.BlockEditing; import electrosphere.collision.CollisionEngine; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java index 90bcdab0..4fd1001e 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java +++ b/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java @@ -9,7 +9,7 @@ import org.joml.Vector3d; import org.joml.Vector3i; import electrosphere.client.terrain.cache.ChunkData; -import electrosphere.data.foliage.FoliageType; +import electrosphere.data.entity.foliage.FoliageType; import electrosphere.engine.Globals; import electrosphere.entity.EntityUtils; import electrosphere.logger.LoggerInterface; diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java index 3a410a3a..16b439f0 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java +++ b/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java @@ -13,7 +13,7 @@ import org.joml.Vector3i; import org.lwjgl.BufferUtils; import electrosphere.client.terrain.cache.ChunkData; -import electrosphere.data.foliage.FoliageType; +import electrosphere.data.entity.foliage.FoliageType; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.queue.QueuedTexture; import electrosphere.engine.assetmanager.queue.QueuedTexture.QueuedTextureType; diff --git a/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java b/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java index 86598213..77b83e3b 100644 --- a/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java +++ b/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java @@ -8,9 +8,9 @@ import org.joml.Vector3f; import org.joml.Vector4d; import electrosphere.client.entity.camera.CameraEntityUtils; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.visualattribute.AttributeVariant; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.visualattribute.AttributeVariant; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.entity.types.creature.ObjectTemplate; diff --git a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java index 131d0c98..b3aa1e13 100644 --- a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java +++ b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java @@ -6,8 +6,8 @@ import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.client.ui.menu.ingame.InventoryMainWindow; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.item.Item; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.signal.Signal.SignalType; diff --git a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java index 2407d689..0aab266a 100644 --- a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java +++ b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java @@ -4,7 +4,7 @@ import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.client.ui.menu.ingame.InventoryMainWindow; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.signal.Signal.SignalType; diff --git a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java index 2b8188de..961c0443 100644 --- a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java +++ b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java @@ -4,7 +4,7 @@ import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.client.ui.menu.ingame.InventoryMainWindow; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java b/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java index 1a354966..d8fb17a9 100644 --- a/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java +++ b/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java @@ -4,7 +4,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Consumer; -import electrosphere.data.common.CommonEntityType; +import electrosphere.data.entity.common.CommonEntityType; import electrosphere.engine.Globals; import electrosphere.renderer.ui.elements.Button; import electrosphere.renderer.ui.elements.Div; diff --git a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java index c6f4b0c9..f8143558 100644 --- a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java +++ b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java @@ -6,7 +6,7 @@ import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.client.ui.menu.ingame.InventoryMainWindow; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/client/ui/components/imgui/CollidableEditBlock.java b/src/main/java/electrosphere/client/ui/components/imgui/CollidableEditBlock.java index fa602c89..b7802b04 100644 --- a/src/main/java/electrosphere/client/ui/components/imgui/CollidableEditBlock.java +++ b/src/main/java/electrosphere/client/ui/components/imgui/CollidableEditBlock.java @@ -7,7 +7,7 @@ import org.ode4j.ode.DCylinder; import org.ode4j.ode.DGeom; import org.ode4j.ode.DMass; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; import imgui.ImGui; /** diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java index 61ad7693..d72bd3b5 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java @@ -19,8 +19,8 @@ import electrosphere.client.ui.menu.debug.entity.tabs.ImGuiEntityInventoryTab; import electrosphere.client.ui.menu.debug.entity.tabs.ImGuiEntityPhysicsTab; import electrosphere.client.ui.menu.debug.entity.tabs.ImGuiEntityServerTab; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.foliage.FoliageType; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.foliage.FoliageType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityActorTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityActorTab.java index ddd80c56..efcd6a65 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityActorTab.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityActorTab.java @@ -3,10 +3,10 @@ package electrosphere.client.ui.menu.debug.entity.tabs; import java.util.Set; import java.util.Random; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.foliage.ProceduralTreeBranchModel; -import electrosphere.data.foliage.TreeModel; -import electrosphere.data.graphics.ProceduralModel; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.foliage.ProceduralTreeBranchModel; +import electrosphere.data.entity.foliage.TreeModel; +import electrosphere.data.entity.graphics.ProceduralModel; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFoliageTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFoliageTab.java index 259e4e1f..5cb3680a 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFoliageTab.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFoliageTab.java @@ -1,8 +1,8 @@ package electrosphere.client.ui.menu.debug.entity.tabs; import electrosphere.client.terrain.foliage.FoliageModel; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.foliage.GrassData; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.foliage.GrassData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityTags; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFurnitureTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFurnitureTab.java index 07f81dbe..bd697103 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFurnitureTab.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityFurnitureTab.java @@ -1,7 +1,7 @@ package electrosphere.client.ui.menu.debug.entity.tabs; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.grident.GridAlignedData; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.grident.GridAlignedData; import electrosphere.entity.Entity; import electrosphere.entity.types.common.CommonEntityUtils; import imgui.ImGui; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityHitboxTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityHitboxTab.java index fa00109b..f1e91892 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityHitboxTab.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityHitboxTab.java @@ -6,7 +6,7 @@ import java.util.List; import org.ode4j.ode.DGeom; import org.ode4j.ode.DSphere; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.HitboxData; import electrosphere.entity.Entity; import electrosphere.entity.state.hitbox.HitboxCollectionState; import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityInteractionTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityInteractionTab.java index 331fe6ef..c6e9e9f0 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityInteractionTab.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityInteractionTab.java @@ -4,7 +4,7 @@ import org.ode4j.ode.DBody; import electrosphere.client.interact.ClientInteractionEngine; import electrosphere.client.ui.components.imgui.CollidableEditBlock; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; import electrosphere.entity.Entity; import imgui.ImGui; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityPhysicsTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityPhysicsTab.java index b829e16a..1ae95176 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityPhysicsTab.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/tabs/ImGuiEntityPhysicsTab.java @@ -4,7 +4,7 @@ import org.ode4j.ode.DBody; import electrosphere.client.ui.components.imgui.CollidableEditBlock; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java index 67b9dc4e..cbf4e880 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java @@ -5,8 +5,8 @@ import org.joml.Vector4f; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.controls.ControlHandler.ControlsState; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.engine.Main; import electrosphere.engine.assetmanager.AssetDataStrings; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java index b9fdfca1..c9aafad6 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java @@ -3,7 +3,7 @@ package electrosphere.client.ui.menu.ingame; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.state.inventory.ClientInventoryState; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java index 385e6038..9832348c 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java @@ -7,10 +7,10 @@ import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.collision.CollisionEngine; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.item.Item; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.item.Item; import electrosphere.data.units.UnitDefinition; import electrosphere.engine.Globals; import electrosphere.engine.signal.Signal.SignalType; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java index a2598b3b..707647fc 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java +++ b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java @@ -5,7 +5,7 @@ import electrosphere.client.ui.components.VoxelSelectionPanel; import electrosphere.client.ui.menu.WindowStrings; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.controls.ControlHandler.ControlsState; -import electrosphere.data.common.CommonEntityType; +import electrosphere.data.entity.common.CommonEntityType; import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.engine.signal.Signal.SignalType; diff --git a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java index db9253fe..7de11ac6 100644 --- a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java +++ b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java @@ -16,9 +16,9 @@ import electrosphere.client.ui.components.SpawnSelectionPanel; import electrosphere.client.ui.components.VoxelSelectionPanel; import electrosphere.client.ui.menu.WindowUtils; import electrosphere.client.ui.menu.ingame.CraftingWindow; -import electrosphere.data.common.CommonEntityType; import electrosphere.data.crafting.RecipeData; -import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.creature.equip.EquipPoint; import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; diff --git a/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java b/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java index f5d3e239..96fc9eee 100644 --- a/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java +++ b/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java @@ -6,9 +6,9 @@ import org.joml.Vector3d; import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.client.ui.menu.debug.entity.ImGuiEntityMacros; import electrosphere.collision.CollisionEngine; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.item.Item; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.types.common.CommonEntityUtils; diff --git a/src/main/java/electrosphere/collision/CollisionEngine.java b/src/main/java/electrosphere/collision/CollisionEngine.java index b58718e4..41c1cb68 100644 --- a/src/main/java/electrosphere/collision/CollisionEngine.java +++ b/src/main/java/electrosphere/collision/CollisionEngine.java @@ -36,8 +36,8 @@ import org.ode4j.ode.OdeHelper; import electrosphere.collision.RayCastCallback.RayCastCallbackData; import electrosphere.collision.collidable.Collidable; import electrosphere.collision.collidable.SurfaceParams; -import electrosphere.data.collidable.CollidableTemplate; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.HitboxData; import electrosphere.engine.Globals; import electrosphere.engine.time.Timekeeper; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/collision/PhysicsEntityUtils.java b/src/main/java/electrosphere/collision/PhysicsEntityUtils.java index 236324f3..306f63b7 100644 --- a/src/main/java/electrosphere/collision/PhysicsEntityUtils.java +++ b/src/main/java/electrosphere/collision/PhysicsEntityUtils.java @@ -10,7 +10,7 @@ import org.ode4j.ode.DBody; import org.ode4j.ode.DGeom; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/collision/PhysicsUtils.java b/src/main/java/electrosphere/collision/PhysicsUtils.java index 64d0eeda..d1bba03e 100644 --- a/src/main/java/electrosphere/collision/PhysicsUtils.java +++ b/src/main/java/electrosphere/collision/PhysicsUtils.java @@ -9,7 +9,7 @@ import org.ode4j.math.DQuaternionC; import org.ode4j.ode.DBody; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; /** * Utilities for leveraging the collision system to perform physics diff --git a/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java b/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java index 038b9420..17b00086 100644 --- a/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java +++ b/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java @@ -1,6 +1,6 @@ package electrosphere.collision.hitbox; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.HitboxData; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java index 6dfac874..56962c2d 100644 --- a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java +++ b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java @@ -23,7 +23,7 @@ import electrosphere.controls.ControlHandler; import electrosphere.controls.ControlHandler.ControlsState; import electrosphere.controls.MouseState; import electrosphere.controls.cursor.CursorState; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.Main; import electrosphere.engine.assetmanager.AssetDataStrings; diff --git a/src/main/java/electrosphere/controls/cursor/CursorState.java b/src/main/java/electrosphere/controls/cursor/CursorState.java index f6135ffe..9b8bbac4 100644 --- a/src/main/java/electrosphere/controls/cursor/CursorState.java +++ b/src/main/java/electrosphere/controls/cursor/CursorState.java @@ -10,8 +10,8 @@ import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.client.interact.select.AreaSelection; import electrosphere.collision.CollisionEngine; import electrosphere.data.block.fab.BlockFab; -import electrosphere.data.grident.GridAlignedData; -import electrosphere.data.item.Item; +import electrosphere.data.entity.grident.GridAlignedData; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.assetmanager.queue.QueuedModel; diff --git a/src/main/java/electrosphere/data/Config.java b/src/main/java/electrosphere/data/Config.java index 5a3eb0cb..6f908c73 100644 --- a/src/main/java/electrosphere/data/Config.java +++ b/src/main/java/electrosphere/data/Config.java @@ -6,20 +6,20 @@ import java.util.List; import electrosphere.data.audio.SurfaceAudioCollection; import electrosphere.data.biome.BiomeTypeMap; import electrosphere.data.block.BlockData; -import electrosphere.data.common.CommonEntityLoader; -import electrosphere.data.common.CommonEntityMap; -import electrosphere.data.common.CommonEntityType; import electrosphere.data.crafting.RecipeDataMap; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.CreatureTypeLoader; -import electrosphere.data.creature.attack.AttackMoveResolver; -import electrosphere.data.creature.CreatureTypeMap; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.foliage.FoliageTypeLoader; -import electrosphere.data.foliage.FoliageTypeMap; -import electrosphere.data.item.ItemDataMap; -import electrosphere.data.item.source.ItemSourcingMap; -import electrosphere.data.projectile.ProjectileTypeHolder; +import electrosphere.data.entity.common.CommonEntityLoader; +import electrosphere.data.entity.common.CommonEntityMap; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.CreatureTypeLoader; +import electrosphere.data.entity.creature.CreatureTypeMap; +import electrosphere.data.entity.creature.attack.AttackMoveResolver; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.foliage.FoliageTypeLoader; +import electrosphere.data.entity.foliage.FoliageTypeMap; +import electrosphere.data.entity.item.ItemDataMap; +import electrosphere.data.entity.item.source.ItemSourcingMap; +import electrosphere.data.entity.projectile.ProjectileTypeHolder; import electrosphere.data.settings.UserSettings; import electrosphere.data.struct.StructureDataLoader; import electrosphere.data.tutorial.HintDefinition; diff --git a/src/main/java/electrosphere/data/ConfigValidator.java b/src/main/java/electrosphere/data/ConfigValidator.java index d0c6f81f..e820cae7 100644 --- a/src/main/java/electrosphere/data/ConfigValidator.java +++ b/src/main/java/electrosphere/data/ConfigValidator.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.common.CommonEntityValidator; import electrosphere.data.crafting.RecipeValidator; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.CreatureDataValidator; -import electrosphere.data.creature.CreatureTypeLoader; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.common.CommonEntityValidator; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.CreatureDataValidator; +import electrosphere.data.entity.creature.CreatureTypeLoader; import electrosphere.server.macro.race.RaceValidator; /** diff --git a/src/main/java/electrosphere/data/crafting/RecipeData.java b/src/main/java/electrosphere/data/crafting/RecipeData.java index 39d5cbe2..7f974117 100644 --- a/src/main/java/electrosphere/data/crafting/RecipeData.java +++ b/src/main/java/electrosphere/data/crafting/RecipeData.java @@ -3,7 +3,7 @@ package electrosphere.data.crafting; import java.util.LinkedList; import java.util.List; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; /** * Data on a crafting recipe diff --git a/src/main/java/electrosphere/data/collidable/CollidableTemplate.java b/src/main/java/electrosphere/data/entity/collidable/CollidableTemplate.java similarity index 99% rename from src/main/java/electrosphere/data/collidable/CollidableTemplate.java rename to src/main/java/electrosphere/data/entity/collidable/CollidableTemplate.java index 908065f8..f12ed1f4 100644 --- a/src/main/java/electrosphere/data/collidable/CollidableTemplate.java +++ b/src/main/java/electrosphere/data/entity/collidable/CollidableTemplate.java @@ -1,4 +1,4 @@ -package electrosphere.data.collidable; +package electrosphere.data.entity.collidable; /** * A template for a rigid body that should be attached to an entity diff --git a/src/main/java/electrosphere/data/collidable/HitboxData.java b/src/main/java/electrosphere/data/entity/collidable/HitboxData.java similarity index 99% rename from src/main/java/electrosphere/data/collidable/HitboxData.java rename to src/main/java/electrosphere/data/entity/collidable/HitboxData.java index bae7bc02..e7a87c3d 100644 --- a/src/main/java/electrosphere/data/collidable/HitboxData.java +++ b/src/main/java/electrosphere/data/entity/collidable/HitboxData.java @@ -1,4 +1,4 @@ -package electrosphere.data.collidable; +package electrosphere.data.entity.collidable; import java.util.List; diff --git a/src/main/java/electrosphere/data/common/CommonEntityLoader.java b/src/main/java/electrosphere/data/entity/common/CommonEntityLoader.java similarity index 93% rename from src/main/java/electrosphere/data/common/CommonEntityLoader.java rename to src/main/java/electrosphere/data/entity/common/CommonEntityLoader.java index 8a47f083..f0d22d45 100644 --- a/src/main/java/electrosphere/data/common/CommonEntityLoader.java +++ b/src/main/java/electrosphere/data/entity/common/CommonEntityLoader.java @@ -1,4 +1,4 @@ -package electrosphere.data.common; +package electrosphere.data.entity.common; import java.util.List; diff --git a/src/main/java/electrosphere/data/common/CommonEntityMap.java b/src/main/java/electrosphere/data/entity/common/CommonEntityMap.java similarity index 96% rename from src/main/java/electrosphere/data/common/CommonEntityMap.java rename to src/main/java/electrosphere/data/entity/common/CommonEntityMap.java index 783ede64..dde6f14c 100644 --- a/src/main/java/electrosphere/data/common/CommonEntityMap.java +++ b/src/main/java/electrosphere/data/entity/common/CommonEntityMap.java @@ -1,4 +1,4 @@ -package electrosphere.data.common; +package electrosphere.data.entity.common; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/electrosphere/data/common/CommonEntityTokens.java b/src/main/java/electrosphere/data/entity/common/CommonEntityTokens.java similarity index 90% rename from src/main/java/electrosphere/data/common/CommonEntityTokens.java rename to src/main/java/electrosphere/data/entity/common/CommonEntityTokens.java index fecd3d97..549041d0 100644 --- a/src/main/java/electrosphere/data/common/CommonEntityTokens.java +++ b/src/main/java/electrosphere/data/entity/common/CommonEntityTokens.java @@ -1,4 +1,4 @@ -package electrosphere.data.common; +package electrosphere.data.entity.common; /** * All common entity tokens diff --git a/src/main/java/electrosphere/data/common/CommonEntityType.java b/src/main/java/electrosphere/data/entity/common/CommonEntityType.java similarity index 86% rename from src/main/java/electrosphere/data/common/CommonEntityType.java rename to src/main/java/electrosphere/data/entity/common/CommonEntityType.java index 22137ce1..bc7c124d 100644 --- a/src/main/java/electrosphere/data/common/CommonEntityType.java +++ b/src/main/java/electrosphere/data/entity/common/CommonEntityType.java @@ -1,33 +1,33 @@ -package electrosphere.data.common; +package electrosphere.data.entity.common; import java.util.List; -import electrosphere.data.collidable.CollidableTemplate; -import electrosphere.data.collidable.HitboxData; -import electrosphere.data.common.camera.CameraData; -import electrosphere.data.common.interact.InteractionData; -import electrosphere.data.common.item.InventoryDescription; -import electrosphere.data.common.item.SpawnItemDescription; -import electrosphere.data.common.life.HealthSystem; -import electrosphere.data.common.light.PointLightDescription; -import electrosphere.data.creature.LookAtSystem; -import electrosphere.data.creature.ViewModelData; -import electrosphere.data.creature.ai.AITreeData; -import electrosphere.data.creature.attack.AttackMove; -import electrosphere.data.creature.attack.AttackMoveResolver; -import electrosphere.data.creature.block.BlockSystem; -import electrosphere.data.creature.bonegroups.BoneGroup; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.creature.equip.ToolbarData; -import electrosphere.data.creature.movement.MovementSystem; -import electrosphere.data.creature.rotator.RotatorSystem; -import electrosphere.data.foliage.AmbientAudio; -import electrosphere.data.foliage.GrowthData; -import electrosphere.data.foliage.GrowthModel; -import electrosphere.data.furniture.FurnitureData; -import electrosphere.data.graphics.GraphicsTemplate; -import electrosphere.data.grident.GridAlignedData; -import electrosphere.data.particle.ParticleEmitter; +import electrosphere.data.entity.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.HitboxData; +import electrosphere.data.entity.common.camera.CameraData; +import electrosphere.data.entity.common.interact.InteractionData; +import electrosphere.data.entity.common.item.InventoryDescription; +import electrosphere.data.entity.common.item.SpawnItemDescription; +import electrosphere.data.entity.common.life.HealthSystem; +import electrosphere.data.entity.common.light.PointLightDescription; +import electrosphere.data.entity.creature.LookAtSystem; +import electrosphere.data.entity.creature.ViewModelData; +import electrosphere.data.entity.creature.ai.AITreeData; +import electrosphere.data.entity.creature.attack.AttackMove; +import electrosphere.data.entity.creature.attack.AttackMoveResolver; +import electrosphere.data.entity.creature.block.BlockSystem; +import electrosphere.data.entity.creature.bonegroups.BoneGroup; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.creature.equip.ToolbarData; +import electrosphere.data.entity.creature.movement.MovementSystem; +import electrosphere.data.entity.creature.rotator.RotatorSystem; +import electrosphere.data.entity.foliage.AmbientAudio; +import electrosphere.data.entity.foliage.GrowthData; +import electrosphere.data.entity.foliage.GrowthModel; +import electrosphere.data.entity.furniture.FurnitureData; +import electrosphere.data.entity.graphics.GraphicsTemplate; +import electrosphere.data.entity.grident.GridAlignedData; +import electrosphere.data.entity.particle.ParticleEmitter; /** * Common data that all entity types use diff --git a/src/main/java/electrosphere/data/common/CommonEntityValidator.java b/src/main/java/electrosphere/data/entity/common/CommonEntityValidator.java similarity index 89% rename from src/main/java/electrosphere/data/common/CommonEntityValidator.java rename to src/main/java/electrosphere/data/entity/common/CommonEntityValidator.java index 4a7af681..9a610176 100644 --- a/src/main/java/electrosphere/data/common/CommonEntityValidator.java +++ b/src/main/java/electrosphere/data/entity/common/CommonEntityValidator.java @@ -1,8 +1,8 @@ -package electrosphere.data.common; +package electrosphere.data.entity.common; import electrosphere.data.Config; -import electrosphere.data.common.life.loot.LootPool; -import electrosphere.data.common.life.loot.LootTicket; +import electrosphere.data.entity.common.life.loot.LootPool; +import electrosphere.data.entity.common.life.loot.LootTicket; import electrosphere.logger.LoggerInterface; /** diff --git a/src/main/java/electrosphere/data/common/camera/CameraData.java b/src/main/java/electrosphere/data/entity/common/camera/CameraData.java similarity index 94% rename from src/main/java/electrosphere/data/common/camera/CameraData.java rename to src/main/java/electrosphere/data/entity/common/camera/CameraData.java index 766a4c12..9f698a3b 100644 --- a/src/main/java/electrosphere/data/common/camera/CameraData.java +++ b/src/main/java/electrosphere/data/entity/common/camera/CameraData.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.camera; +package electrosphere.data.entity.common.camera; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/data/common/interact/InteractionData.java b/src/main/java/electrosphere/data/entity/common/interact/InteractionData.java similarity index 94% rename from src/main/java/electrosphere/data/common/interact/InteractionData.java rename to src/main/java/electrosphere/data/entity/common/interact/InteractionData.java index baf00949..1fccc6f8 100644 --- a/src/main/java/electrosphere/data/common/interact/InteractionData.java +++ b/src/main/java/electrosphere/data/entity/common/interact/InteractionData.java @@ -1,6 +1,6 @@ -package electrosphere.data.common.interact; +package electrosphere.data.entity.common.interact; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; /** * Controls handling when interacting with this entity diff --git a/src/main/java/electrosphere/data/common/item/InventoryDescription.java b/src/main/java/electrosphere/data/entity/common/item/InventoryDescription.java similarity index 88% rename from src/main/java/electrosphere/data/common/item/InventoryDescription.java rename to src/main/java/electrosphere/data/entity/common/item/InventoryDescription.java index 6f5fabeb..e81d7709 100644 --- a/src/main/java/electrosphere/data/common/item/InventoryDescription.java +++ b/src/main/java/electrosphere/data/entity/common/item/InventoryDescription.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.item; +package electrosphere.data.entity.common.item; /** * Describes the inventory on an inventory diff --git a/src/main/java/electrosphere/data/common/item/SpawnItemDescription.java b/src/main/java/electrosphere/data/entity/common/item/SpawnItemDescription.java similarity index 91% rename from src/main/java/electrosphere/data/common/item/SpawnItemDescription.java rename to src/main/java/electrosphere/data/entity/common/item/SpawnItemDescription.java index 045b8cae..c8cf7012 100644 --- a/src/main/java/electrosphere/data/common/item/SpawnItemDescription.java +++ b/src/main/java/electrosphere/data/entity/common/item/SpawnItemDescription.java @@ -1,7 +1,7 @@ -package electrosphere.data.common.item; +package electrosphere.data.entity.common.item; import electrosphere.data.crafting.RecipeData; -import electrosphere.data.graphics.GraphicsTemplate; +import electrosphere.data.entity.graphics.GraphicsTemplate; /** * Describes an automatically generated item definition for an item that can spawn this object diff --git a/src/main/java/electrosphere/data/common/life/HealthSystem.java b/src/main/java/electrosphere/data/entity/common/life/HealthSystem.java similarity index 86% rename from src/main/java/electrosphere/data/common/life/HealthSystem.java rename to src/main/java/electrosphere/data/entity/common/life/HealthSystem.java index 35e6095f..d674502b 100644 --- a/src/main/java/electrosphere/data/common/life/HealthSystem.java +++ b/src/main/java/electrosphere/data/entity/common/life/HealthSystem.java @@ -1,7 +1,7 @@ -package electrosphere.data.common.life; +package electrosphere.data.entity.common.life; -import electrosphere.data.common.life.loot.LootPool; -import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.entity.common.life.loot.LootPool; +import electrosphere.data.entity.common.treedata.TreeDataState; /** * Data about the health of a creature diff --git a/src/main/java/electrosphere/data/common/life/loot/LootPool.java b/src/main/java/electrosphere/data/entity/common/life/loot/LootPool.java similarity index 92% rename from src/main/java/electrosphere/data/common/life/loot/LootPool.java rename to src/main/java/electrosphere/data/entity/common/life/loot/LootPool.java index 95d0e2e3..cbb46e14 100644 --- a/src/main/java/electrosphere/data/common/life/loot/LootPool.java +++ b/src/main/java/electrosphere/data/entity/common/life/loot/LootPool.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.life.loot; +package electrosphere.data.entity.common.life.loot; import java.util.List; diff --git a/src/main/java/electrosphere/data/common/life/loot/LootTicket.java b/src/main/java/electrosphere/data/entity/common/life/loot/LootTicket.java similarity index 97% rename from src/main/java/electrosphere/data/common/life/loot/LootTicket.java rename to src/main/java/electrosphere/data/entity/common/life/loot/LootTicket.java index 263d778e..e291c81c 100644 --- a/src/main/java/electrosphere/data/common/life/loot/LootTicket.java +++ b/src/main/java/electrosphere/data/entity/common/life/loot/LootTicket.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.life.loot; +package electrosphere.data.entity.common.life.loot; /** * A ticket that can be selected when dropping from the loot pool diff --git a/src/main/java/electrosphere/data/common/light/PointLightDescription.java b/src/main/java/electrosphere/data/entity/common/light/PointLightDescription.java similarity index 98% rename from src/main/java/electrosphere/data/common/light/PointLightDescription.java rename to src/main/java/electrosphere/data/entity/common/light/PointLightDescription.java index ca459f76..a07dc5e2 100644 --- a/src/main/java/electrosphere/data/common/light/PointLightDescription.java +++ b/src/main/java/electrosphere/data/entity/common/light/PointLightDescription.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.light; +package electrosphere.data.entity.common.light; import org.joml.Vector3d; import org.joml.Vector3f; diff --git a/src/main/java/electrosphere/data/common/treedata/TreeDataAnimation.java b/src/main/java/electrosphere/data/entity/common/treedata/TreeDataAnimation.java similarity index 97% rename from src/main/java/electrosphere/data/common/treedata/TreeDataAnimation.java rename to src/main/java/electrosphere/data/entity/common/treedata/TreeDataAnimation.java index 54b738f1..693602c0 100644 --- a/src/main/java/electrosphere/data/common/treedata/TreeDataAnimation.java +++ b/src/main/java/electrosphere/data/entity/common/treedata/TreeDataAnimation.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.treedata; +package electrosphere.data.entity.common.treedata; import java.util.List; diff --git a/src/main/java/electrosphere/data/common/treedata/TreeDataAudio.java b/src/main/java/electrosphere/data/entity/common/treedata/TreeDataAudio.java similarity index 86% rename from src/main/java/electrosphere/data/common/treedata/TreeDataAudio.java rename to src/main/java/electrosphere/data/entity/common/treedata/TreeDataAudio.java index dbaeacf9..b7298fd1 100644 --- a/src/main/java/electrosphere/data/common/treedata/TreeDataAudio.java +++ b/src/main/java/electrosphere/data/entity/common/treedata/TreeDataAudio.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.treedata; +package electrosphere.data.entity.common.treedata; /** * Audio data to use when running a given tree state diff --git a/src/main/java/electrosphere/data/common/treedata/TreeDataState.java b/src/main/java/electrosphere/data/entity/common/treedata/TreeDataState.java similarity index 92% rename from src/main/java/electrosphere/data/common/treedata/TreeDataState.java rename to src/main/java/electrosphere/data/entity/common/treedata/TreeDataState.java index 22cb7505..20082005 100644 --- a/src/main/java/electrosphere/data/common/treedata/TreeDataState.java +++ b/src/main/java/electrosphere/data/entity/common/treedata/TreeDataState.java @@ -1,4 +1,4 @@ -package electrosphere.data.common.treedata; +package electrosphere.data.entity.common.treedata; /** * A simple tree state diff --git a/src/main/java/electrosphere/data/creature/CreatureData.java b/src/main/java/electrosphere/data/entity/creature/CreatureData.java similarity index 74% rename from src/main/java/electrosphere/data/creature/CreatureData.java rename to src/main/java/electrosphere/data/entity/creature/CreatureData.java index 771d12a7..fda4ec55 100644 --- a/src/main/java/electrosphere/data/creature/CreatureData.java +++ b/src/main/java/electrosphere/data/entity/creature/CreatureData.java @@ -1,9 +1,9 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; import java.util.List; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; /** * A given type of creature diff --git a/src/main/java/electrosphere/data/creature/CreatureDataValidator.java b/src/main/java/electrosphere/data/entity/creature/CreatureDataValidator.java similarity index 90% rename from src/main/java/electrosphere/data/creature/CreatureDataValidator.java rename to src/main/java/electrosphere/data/entity/creature/CreatureDataValidator.java index 1f9917c2..3da35afc 100644 --- a/src/main/java/electrosphere/data/creature/CreatureDataValidator.java +++ b/src/main/java/electrosphere/data/entity/creature/CreatureDataValidator.java @@ -1,16 +1,16 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; import java.util.LinkedList; import java.util.List; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.attack.AttackMove; -import electrosphere.data.creature.bonegroups.BoneGroup; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.creature.movement.FallMovementSystem; -import electrosphere.data.creature.movement.GroundMovementSystem; -import electrosphere.data.creature.movement.JumpMovementSystem; -import electrosphere.data.creature.movement.MovementSystem; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.attack.AttackMove; +import electrosphere.data.entity.creature.bonegroups.BoneGroup; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.creature.movement.FallMovementSystem; +import electrosphere.data.entity.creature.movement.GroundMovementSystem; +import electrosphere.data.entity.creature.movement.JumpMovementSystem; +import electrosphere.data.entity.creature.movement.MovementSystem; import electrosphere.logger.LoggerInterface; /** diff --git a/src/main/java/electrosphere/data/creature/CreatureTypeLoader.java b/src/main/java/electrosphere/data/entity/creature/CreatureTypeLoader.java similarity index 98% rename from src/main/java/electrosphere/data/creature/CreatureTypeLoader.java rename to src/main/java/electrosphere/data/entity/creature/CreatureTypeLoader.java index dbde7c58..0925e84e 100644 --- a/src/main/java/electrosphere/data/creature/CreatureTypeLoader.java +++ b/src/main/java/electrosphere/data/entity/creature/CreatureTypeLoader.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/electrosphere/data/creature/CreatureTypeMap.java b/src/main/java/electrosphere/data/entity/creature/CreatureTypeMap.java similarity index 86% rename from src/main/java/electrosphere/data/creature/CreatureTypeMap.java rename to src/main/java/electrosphere/data/entity/creature/CreatureTypeMap.java index 4ae3bf99..6d6278ae 100644 --- a/src/main/java/electrosphere/data/creature/CreatureTypeMap.java +++ b/src/main/java/electrosphere/data/entity/creature/CreatureTypeMap.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; import java.util.List; diff --git a/src/main/java/electrosphere/data/creature/IdleData.java b/src/main/java/electrosphere/data/entity/creature/IdleData.java similarity index 77% rename from src/main/java/electrosphere/data/creature/IdleData.java rename to src/main/java/electrosphere/data/entity/creature/IdleData.java index a1f682c0..4a9012ea 100644 --- a/src/main/java/electrosphere/data/creature/IdleData.java +++ b/src/main/java/electrosphere/data/entity/creature/IdleData.java @@ -1,6 +1,6 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; -import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; /** * Data about how the creature will behave when in idle state diff --git a/src/main/java/electrosphere/data/creature/LookAtSystem.java b/src/main/java/electrosphere/data/entity/creature/LookAtSystem.java similarity index 91% rename from src/main/java/electrosphere/data/creature/LookAtSystem.java rename to src/main/java/electrosphere/data/entity/creature/LookAtSystem.java index d7d55a5d..fce01e70 100644 --- a/src/main/java/electrosphere/data/creature/LookAtSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/LookAtSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; /** * Look at behavior and data diff --git a/src/main/java/electrosphere/data/creature/SprintSystem.java b/src/main/java/electrosphere/data/entity/creature/SprintSystem.java similarity index 93% rename from src/main/java/electrosphere/data/creature/SprintSystem.java rename to src/main/java/electrosphere/data/entity/creature/SprintSystem.java index e182b5a1..bad500bb 100644 --- a/src/main/java/electrosphere/data/creature/SprintSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/SprintSystem.java @@ -1,6 +1,6 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; -import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; /** * Sprint data diff --git a/src/main/java/electrosphere/data/creature/ViewModelData.java b/src/main/java/electrosphere/data/entity/creature/ViewModelData.java similarity index 96% rename from src/main/java/electrosphere/data/creature/ViewModelData.java rename to src/main/java/electrosphere/data/entity/creature/ViewModelData.java index 6560d1b7..a5cce040 100644 --- a/src/main/java/electrosphere/data/creature/ViewModelData.java +++ b/src/main/java/electrosphere/data/entity/creature/ViewModelData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature; +package electrosphere.data.entity.creature; /** * Data about the first person view model for this creature type diff --git a/src/main/java/electrosphere/data/creature/ai/AITreeData.java b/src/main/java/electrosphere/data/entity/creature/ai/AITreeData.java similarity index 78% rename from src/main/java/electrosphere/data/creature/ai/AITreeData.java rename to src/main/java/electrosphere/data/entity/creature/ai/AITreeData.java index 4f3cd39b..46a2c7a6 100644 --- a/src/main/java/electrosphere/data/creature/ai/AITreeData.java +++ b/src/main/java/electrosphere/data/entity/creature/ai/AITreeData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.ai; +package electrosphere.data.entity.creature.ai; /** * Configuration data for an ai tree diff --git a/src/main/java/electrosphere/data/creature/ai/AITreeDataSerializer.java b/src/main/java/electrosphere/data/entity/creature/ai/AITreeDataSerializer.java similarity index 97% rename from src/main/java/electrosphere/data/creature/ai/AITreeDataSerializer.java rename to src/main/java/electrosphere/data/entity/creature/ai/AITreeDataSerializer.java index 656a02a5..2a424809 100644 --- a/src/main/java/electrosphere/data/creature/ai/AITreeDataSerializer.java +++ b/src/main/java/electrosphere/data/entity/creature/ai/AITreeDataSerializer.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.ai; +package electrosphere.data.entity.creature.ai; import java.lang.reflect.Type; diff --git a/src/main/java/electrosphere/data/creature/ai/AttackerTreeData.java b/src/main/java/electrosphere/data/entity/creature/ai/AttackerTreeData.java similarity index 94% rename from src/main/java/electrosphere/data/creature/ai/AttackerTreeData.java rename to src/main/java/electrosphere/data/entity/creature/ai/AttackerTreeData.java index 8c36a28d..b657c502 100644 --- a/src/main/java/electrosphere/data/creature/ai/AttackerTreeData.java +++ b/src/main/java/electrosphere/data/entity/creature/ai/AttackerTreeData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.ai; +package electrosphere.data.entity.creature.ai; import electrosphere.server.ai.trees.creature.AttackerAITree; diff --git a/src/main/java/electrosphere/data/creature/ai/BlockerTreeData.java b/src/main/java/electrosphere/data/entity/creature/ai/BlockerTreeData.java similarity index 84% rename from src/main/java/electrosphere/data/creature/ai/BlockerTreeData.java rename to src/main/java/electrosphere/data/entity/creature/ai/BlockerTreeData.java index 3dec8d24..ca41a279 100644 --- a/src/main/java/electrosphere/data/creature/ai/BlockerTreeData.java +++ b/src/main/java/electrosphere/data/entity/creature/ai/BlockerTreeData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.ai; +package electrosphere.data.entity.creature.ai; import electrosphere.server.ai.trees.test.BlockerAITree; diff --git a/src/main/java/electrosphere/data/creature/ai/MaslowTreeData.java b/src/main/java/electrosphere/data/entity/creature/ai/MaslowTreeData.java similarity index 87% rename from src/main/java/electrosphere/data/creature/ai/MaslowTreeData.java rename to src/main/java/electrosphere/data/entity/creature/ai/MaslowTreeData.java index b36bb300..9c4106c5 100644 --- a/src/main/java/electrosphere/data/creature/ai/MaslowTreeData.java +++ b/src/main/java/electrosphere/data/entity/creature/ai/MaslowTreeData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.ai; +package electrosphere.data.entity.creature.ai; import electrosphere.server.ai.trees.hierarchy.MaslowTree; diff --git a/src/main/java/electrosphere/data/creature/ai/StandardCharacterTreeData.java b/src/main/java/electrosphere/data/entity/creature/ai/StandardCharacterTreeData.java similarity index 88% rename from src/main/java/electrosphere/data/creature/ai/StandardCharacterTreeData.java rename to src/main/java/electrosphere/data/entity/creature/ai/StandardCharacterTreeData.java index 1d575514..2bb568e2 100644 --- a/src/main/java/electrosphere/data/creature/ai/StandardCharacterTreeData.java +++ b/src/main/java/electrosphere/data/entity/creature/ai/StandardCharacterTreeData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.ai; +package electrosphere.data.entity.creature.ai; import electrosphere.server.ai.trees.character.StandardCharacterTree; diff --git a/src/main/java/electrosphere/data/creature/attack/AttackMove.java b/src/main/java/electrosphere/data/entity/creature/attack/AttackMove.java similarity index 97% rename from src/main/java/electrosphere/data/creature/attack/AttackMove.java rename to src/main/java/electrosphere/data/entity/creature/attack/AttackMove.java index c954d23d..ca6b84a3 100644 --- a/src/main/java/electrosphere/data/creature/attack/AttackMove.java +++ b/src/main/java/electrosphere/data/entity/creature/attack/AttackMove.java @@ -1,8 +1,8 @@ -package electrosphere.data.creature.attack; +package electrosphere.data.entity.creature.attack; import java.util.List; -import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.entity.common.treedata.TreeDataState; /** * Data about a single attack move this creature is capable of diff --git a/src/main/java/electrosphere/data/creature/attack/AttackMoveResolver.java b/src/main/java/electrosphere/data/entity/creature/attack/AttackMoveResolver.java similarity index 98% rename from src/main/java/electrosphere/data/creature/attack/AttackMoveResolver.java rename to src/main/java/electrosphere/data/entity/creature/attack/AttackMoveResolver.java index d20269ea..8a3697da 100644 --- a/src/main/java/electrosphere/data/creature/attack/AttackMoveResolver.java +++ b/src/main/java/electrosphere/data/entity/creature/attack/AttackMoveResolver.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.attack; +package electrosphere.data.entity.creature.attack; import java.util.HashMap; import java.util.LinkedList; diff --git a/src/main/java/electrosphere/data/creature/block/BlockSystem.java b/src/main/java/electrosphere/data/entity/creature/block/BlockSystem.java similarity index 97% rename from src/main/java/electrosphere/data/creature/block/BlockSystem.java rename to src/main/java/electrosphere/data/entity/creature/block/BlockSystem.java index a03d248c..efdb433e 100644 --- a/src/main/java/electrosphere/data/creature/block/BlockSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/block/BlockSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.block; +package electrosphere.data.entity.creature.block; import java.util.List; diff --git a/src/main/java/electrosphere/data/creature/block/BlockVariant.java b/src/main/java/electrosphere/data/entity/creature/block/BlockVariant.java similarity index 92% rename from src/main/java/electrosphere/data/creature/block/BlockVariant.java rename to src/main/java/electrosphere/data/entity/creature/block/BlockVariant.java index 96093630..690ea224 100644 --- a/src/main/java/electrosphere/data/creature/block/BlockVariant.java +++ b/src/main/java/electrosphere/data/entity/creature/block/BlockVariant.java @@ -1,9 +1,9 @@ -package electrosphere.data.creature.block; +package electrosphere.data.entity.creature.block; import java.util.List; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.common.treedata.TreeDataAudio; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAudio; /** * A variant of data that can be loaded into the block system. Variants are for different types of equip states. diff --git a/src/main/java/electrosphere/data/creature/block/VariantDefaults.java b/src/main/java/electrosphere/data/entity/creature/block/VariantDefaults.java similarity index 93% rename from src/main/java/electrosphere/data/creature/block/VariantDefaults.java rename to src/main/java/electrosphere/data/entity/creature/block/VariantDefaults.java index 8b38bf51..4bb280d2 100644 --- a/src/main/java/electrosphere/data/creature/block/VariantDefaults.java +++ b/src/main/java/electrosphere/data/entity/creature/block/VariantDefaults.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.block; +package electrosphere.data.entity.creature.block; /** * Equip point cases that this variant is used as the default for diff --git a/src/main/java/electrosphere/data/creature/bonegroups/BoneGroup.java b/src/main/java/electrosphere/data/entity/creature/bonegroups/BoneGroup.java similarity index 95% rename from src/main/java/electrosphere/data/creature/bonegroups/BoneGroup.java rename to src/main/java/electrosphere/data/entity/creature/bonegroups/BoneGroup.java index c6e8328e..c8e2bc36 100644 --- a/src/main/java/electrosphere/data/creature/bonegroups/BoneGroup.java +++ b/src/main/java/electrosphere/data/entity/creature/bonegroups/BoneGroup.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.bonegroups; +package electrosphere.data.entity.creature.bonegroups; import java.util.List; diff --git a/src/main/java/electrosphere/data/creature/equip/EquipPoint.java b/src/main/java/electrosphere/data/entity/creature/equip/EquipPoint.java similarity index 98% rename from src/main/java/electrosphere/data/creature/equip/EquipPoint.java rename to src/main/java/electrosphere/data/entity/creature/equip/EquipPoint.java index d0195790..425c7df4 100644 --- a/src/main/java/electrosphere/data/creature/equip/EquipPoint.java +++ b/src/main/java/electrosphere/data/entity/creature/equip/EquipPoint.java @@ -1,8 +1,8 @@ -package electrosphere.data.creature.equip; +package electrosphere.data.entity.creature.equip; import java.util.List; -import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; /** * A portion of the creature that can have an item attached to it diff --git a/src/main/java/electrosphere/data/creature/equip/ToolbarData.java b/src/main/java/electrosphere/data/entity/creature/equip/ToolbarData.java similarity index 92% rename from src/main/java/electrosphere/data/creature/equip/ToolbarData.java rename to src/main/java/electrosphere/data/entity/creature/equip/ToolbarData.java index 09623c0c..f556776c 100644 --- a/src/main/java/electrosphere/data/creature/equip/ToolbarData.java +++ b/src/main/java/electrosphere/data/entity/creature/equip/ToolbarData.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.equip; +package electrosphere.data.entity.creature.equip; /** * Data about the toolbar diff --git a/src/main/java/electrosphere/data/creature/movement/AirplaneMovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/AirplaneMovementSystem.java similarity index 92% rename from src/main/java/electrosphere/data/creature/movement/AirplaneMovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/AirplaneMovementSystem.java index 1a2e99b4..1c6dd13f 100644 --- a/src/main/java/electrosphere/data/creature/movement/AirplaneMovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/AirplaneMovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; public class AirplaneMovementSystem implements MovementSystem { diff --git a/src/main/java/electrosphere/data/creature/movement/EditorMovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/EditorMovementSystem.java similarity index 88% rename from src/main/java/electrosphere/data/creature/movement/EditorMovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/EditorMovementSystem.java index 32f07764..55c306e9 100644 --- a/src/main/java/electrosphere/data/creature/movement/EditorMovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/EditorMovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; /** * Data about the editor movement system diff --git a/src/main/java/electrosphere/data/creature/movement/FallMovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/FallMovementSystem.java similarity index 87% rename from src/main/java/electrosphere/data/creature/movement/FallMovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/FallMovementSystem.java index 8539b4c2..fc2360b5 100644 --- a/src/main/java/electrosphere/data/creature/movement/FallMovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/FallMovementSystem.java @@ -1,6 +1,6 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; -import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.entity.common.treedata.TreeDataState; /** * Data about a falling movement system diff --git a/src/main/java/electrosphere/data/creature/movement/GroundMovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/GroundMovementSystem.java similarity index 94% rename from src/main/java/electrosphere/data/creature/movement/GroundMovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/GroundMovementSystem.java index d48c0af0..ab4e63d5 100644 --- a/src/main/java/electrosphere/data/creature/movement/GroundMovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/GroundMovementSystem.java @@ -1,7 +1,7 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.SprintSystem; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.SprintSystem; /** * A ground movement system's data diff --git a/src/main/java/electrosphere/data/creature/movement/JumpMovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/JumpMovementSystem.java similarity index 90% rename from src/main/java/electrosphere/data/creature/movement/JumpMovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/JumpMovementSystem.java index dfce5920..3c770f0c 100644 --- a/src/main/java/electrosphere/data/creature/movement/JumpMovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/JumpMovementSystem.java @@ -1,6 +1,6 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; -import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; /** * A jump tree's data diff --git a/src/main/java/electrosphere/data/creature/movement/MovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/MovementSystem.java similarity index 57% rename from src/main/java/electrosphere/data/creature/movement/MovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/MovementSystem.java index 95fa1628..90514802 100644 --- a/src/main/java/electrosphere/data/creature/movement/MovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/MovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; public interface MovementSystem { diff --git a/src/main/java/electrosphere/data/creature/movement/MovementSystemSerializer.java b/src/main/java/electrosphere/data/entity/creature/movement/MovementSystemSerializer.java similarity index 96% rename from src/main/java/electrosphere/data/creature/movement/MovementSystemSerializer.java rename to src/main/java/electrosphere/data/entity/creature/movement/MovementSystemSerializer.java index 824276f7..bce45706 100644 --- a/src/main/java/electrosphere/data/creature/movement/MovementSystemSerializer.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/MovementSystemSerializer.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; import java.lang.reflect.Type; diff --git a/src/main/java/electrosphere/data/creature/movement/WalkMovementSystem.java b/src/main/java/electrosphere/data/entity/creature/movement/WalkMovementSystem.java similarity index 90% rename from src/main/java/electrosphere/data/creature/movement/WalkMovementSystem.java rename to src/main/java/electrosphere/data/entity/creature/movement/WalkMovementSystem.java index 4909f8dd..84e4d73a 100644 --- a/src/main/java/electrosphere/data/creature/movement/WalkMovementSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/movement/WalkMovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.movement; +package electrosphere.data.entity.creature.movement; /** * A walk movement system diff --git a/src/main/java/electrosphere/data/creature/rotator/RotatorConstraint.java b/src/main/java/electrosphere/data/entity/creature/rotator/RotatorConstraint.java similarity index 91% rename from src/main/java/electrosphere/data/creature/rotator/RotatorConstraint.java rename to src/main/java/electrosphere/data/entity/creature/rotator/RotatorConstraint.java index bd1faf91..f82aa49a 100644 --- a/src/main/java/electrosphere/data/creature/rotator/RotatorConstraint.java +++ b/src/main/java/electrosphere/data/entity/creature/rotator/RotatorConstraint.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.rotator; +package electrosphere.data.entity.creature.rotator; public class RotatorConstraint { diff --git a/src/main/java/electrosphere/data/creature/rotator/RotatorItem.java b/src/main/java/electrosphere/data/entity/creature/rotator/RotatorItem.java similarity index 83% rename from src/main/java/electrosphere/data/creature/rotator/RotatorItem.java rename to src/main/java/electrosphere/data/entity/creature/rotator/RotatorItem.java index 28a2bac2..a76fa224 100644 --- a/src/main/java/electrosphere/data/creature/rotator/RotatorItem.java +++ b/src/main/java/electrosphere/data/entity/creature/rotator/RotatorItem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.rotator; +package electrosphere.data.entity.creature.rotator; import java.util.List; diff --git a/src/main/java/electrosphere/data/creature/rotator/RotatorSystem.java b/src/main/java/electrosphere/data/entity/creature/rotator/RotatorSystem.java similarity index 77% rename from src/main/java/electrosphere/data/creature/rotator/RotatorSystem.java rename to src/main/java/electrosphere/data/entity/creature/rotator/RotatorSystem.java index cd84c08c..2f5c9302 100644 --- a/src/main/java/electrosphere/data/creature/rotator/RotatorSystem.java +++ b/src/main/java/electrosphere/data/entity/creature/rotator/RotatorSystem.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.rotator; +package electrosphere.data.entity.creature.rotator; import java.util.List; diff --git a/src/main/java/electrosphere/data/creature/visualattribute/AttributeVariant.java b/src/main/java/electrosphere/data/entity/creature/visualattribute/AttributeVariant.java similarity index 83% rename from src/main/java/electrosphere/data/creature/visualattribute/AttributeVariant.java rename to src/main/java/electrosphere/data/entity/creature/visualattribute/AttributeVariant.java index ce499660..d4f3b29b 100644 --- a/src/main/java/electrosphere/data/creature/visualattribute/AttributeVariant.java +++ b/src/main/java/electrosphere/data/entity/creature/visualattribute/AttributeVariant.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.visualattribute; +package electrosphere.data.entity.creature.visualattribute; import java.util.List; diff --git a/src/main/java/electrosphere/data/creature/visualattribute/VisualAttribute.java b/src/main/java/electrosphere/data/entity/creature/visualattribute/VisualAttribute.java similarity index 95% rename from src/main/java/electrosphere/data/creature/visualattribute/VisualAttribute.java rename to src/main/java/electrosphere/data/entity/creature/visualattribute/VisualAttribute.java index 8312cc6b..90ac5a73 100644 --- a/src/main/java/electrosphere/data/creature/visualattribute/VisualAttribute.java +++ b/src/main/java/electrosphere/data/entity/creature/visualattribute/VisualAttribute.java @@ -1,4 +1,4 @@ -package electrosphere.data.creature.visualattribute; +package electrosphere.data.entity.creature.visualattribute; import java.util.List; diff --git a/src/main/java/electrosphere/data/foliage/AmbientAudio.java b/src/main/java/electrosphere/data/entity/foliage/AmbientAudio.java similarity index 97% rename from src/main/java/electrosphere/data/foliage/AmbientAudio.java rename to src/main/java/electrosphere/data/entity/foliage/AmbientAudio.java index d6660d83..15ae61e5 100644 --- a/src/main/java/electrosphere/data/foliage/AmbientAudio.java +++ b/src/main/java/electrosphere/data/entity/foliage/AmbientAudio.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; /** * Parameters for ambient audio generation by this foliage diff --git a/src/main/java/electrosphere/data/foliage/FoliageType.java b/src/main/java/electrosphere/data/entity/foliage/FoliageType.java similarity index 90% rename from src/main/java/electrosphere/data/foliage/FoliageType.java rename to src/main/java/electrosphere/data/entity/foliage/FoliageType.java index 5e17c0f2..1c14a073 100644 --- a/src/main/java/electrosphere/data/foliage/FoliageType.java +++ b/src/main/java/electrosphere/data/entity/foliage/FoliageType.java @@ -1,8 +1,8 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; import java.util.List; -import electrosphere.data.common.CommonEntityType; +import electrosphere.data.entity.common.CommonEntityType; /** * A foliage object, ambient or otherwise diff --git a/src/main/java/electrosphere/data/foliage/FoliageTypeLoader.java b/src/main/java/electrosphere/data/entity/foliage/FoliageTypeLoader.java similarity index 96% rename from src/main/java/electrosphere/data/foliage/FoliageTypeLoader.java rename to src/main/java/electrosphere/data/entity/foliage/FoliageTypeLoader.java index 9c4ff1d2..48c3c940 100644 --- a/src/main/java/electrosphere/data/foliage/FoliageTypeLoader.java +++ b/src/main/java/electrosphere/data/entity/foliage/FoliageTypeLoader.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/electrosphere/data/foliage/FoliageTypeMap.java b/src/main/java/electrosphere/data/entity/foliage/FoliageTypeMap.java similarity index 95% rename from src/main/java/electrosphere/data/foliage/FoliageTypeMap.java rename to src/main/java/electrosphere/data/entity/foliage/FoliageTypeMap.java index e0639e7a..bee90432 100644 --- a/src/main/java/electrosphere/data/foliage/FoliageTypeMap.java +++ b/src/main/java/electrosphere/data/entity/foliage/FoliageTypeMap.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; import java.util.List; diff --git a/src/main/java/electrosphere/data/foliage/GrassData.java b/src/main/java/electrosphere/data/entity/foliage/GrassData.java similarity index 97% rename from src/main/java/electrosphere/data/foliage/GrassData.java rename to src/main/java/electrosphere/data/entity/foliage/GrassData.java index 6d032a0a..6a036ca0 100644 --- a/src/main/java/electrosphere/data/foliage/GrassData.java +++ b/src/main/java/electrosphere/data/entity/foliage/GrassData.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; import org.joml.Vector3f; diff --git a/src/main/java/electrosphere/data/foliage/GrowthData.java b/src/main/java/electrosphere/data/entity/foliage/GrowthData.java similarity index 89% rename from src/main/java/electrosphere/data/foliage/GrowthData.java rename to src/main/java/electrosphere/data/entity/foliage/GrowthData.java index 58652e1d..8eba425a 100644 --- a/src/main/java/electrosphere/data/foliage/GrowthData.java +++ b/src/main/java/electrosphere/data/entity/foliage/GrowthData.java @@ -1,6 +1,6 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; -import electrosphere.data.common.life.loot.LootPool; +import electrosphere.data.entity.common.life.loot.LootPool; /** * Data that controls the growth characteristics of an entity that grows into something diff --git a/src/main/java/electrosphere/data/foliage/GrowthModel.java b/src/main/java/electrosphere/data/entity/foliage/GrowthModel.java similarity index 88% rename from src/main/java/electrosphere/data/foliage/GrowthModel.java rename to src/main/java/electrosphere/data/entity/foliage/GrowthModel.java index c22bf29f..c196339e 100644 --- a/src/main/java/electrosphere/data/foliage/GrowthModel.java +++ b/src/main/java/electrosphere/data/entity/foliage/GrowthModel.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; /** * Model of the growth characteristics of this piece of foliage diff --git a/src/main/java/electrosphere/data/foliage/PhysicsObject.java b/src/main/java/electrosphere/data/entity/foliage/PhysicsObject.java similarity index 94% rename from src/main/java/electrosphere/data/foliage/PhysicsObject.java rename to src/main/java/electrosphere/data/entity/foliage/PhysicsObject.java index df5a434d..2884fbb3 100644 --- a/src/main/java/electrosphere/data/foliage/PhysicsObject.java +++ b/src/main/java/electrosphere/data/entity/foliage/PhysicsObject.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; /** * Physics data diff --git a/src/main/java/electrosphere/data/foliage/ProceduralTreeBranchModel.java b/src/main/java/electrosphere/data/entity/foliage/ProceduralTreeBranchModel.java similarity index 98% rename from src/main/java/electrosphere/data/foliage/ProceduralTreeBranchModel.java rename to src/main/java/electrosphere/data/entity/foliage/ProceduralTreeBranchModel.java index 1dfae4ab..7955274c 100644 --- a/src/main/java/electrosphere/data/foliage/ProceduralTreeBranchModel.java +++ b/src/main/java/electrosphere/data/entity/foliage/ProceduralTreeBranchModel.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; /** * Data for creating branches on a procedural tree diff --git a/src/main/java/electrosphere/data/foliage/ProceduralTreeTrunkModel.java b/src/main/java/electrosphere/data/entity/foliage/ProceduralTreeTrunkModel.java similarity index 97% rename from src/main/java/electrosphere/data/foliage/ProceduralTreeTrunkModel.java rename to src/main/java/electrosphere/data/entity/foliage/ProceduralTreeTrunkModel.java index 16e259c0..283a73d0 100644 --- a/src/main/java/electrosphere/data/foliage/ProceduralTreeTrunkModel.java +++ b/src/main/java/electrosphere/data/entity/foliage/ProceduralTreeTrunkModel.java @@ -1,4 +1,4 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; /** * The data model for the trunk of the procedural tree diff --git a/src/main/java/electrosphere/data/foliage/TreeModel.java b/src/main/java/electrosphere/data/entity/foliage/TreeModel.java similarity index 98% rename from src/main/java/electrosphere/data/foliage/TreeModel.java rename to src/main/java/electrosphere/data/entity/foliage/TreeModel.java index 96961be4..86ff8545 100644 --- a/src/main/java/electrosphere/data/foliage/TreeModel.java +++ b/src/main/java/electrosphere/data/entity/foliage/TreeModel.java @@ -1,6 +1,6 @@ -package electrosphere.data.foliage; +package electrosphere.data.entity.foliage; -import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.CollidableTemplate; /** * Describes characteristics about a type of tree (how do the limbs dispere, where to the leaves start growing, how sturdy is it, etc) diff --git a/src/main/java/electrosphere/data/furniture/DoorData.java b/src/main/java/electrosphere/data/entity/furniture/DoorData.java similarity index 92% rename from src/main/java/electrosphere/data/furniture/DoorData.java rename to src/main/java/electrosphere/data/entity/furniture/DoorData.java index cf6a64a0..cf9a232e 100644 --- a/src/main/java/electrosphere/data/furniture/DoorData.java +++ b/src/main/java/electrosphere/data/entity/furniture/DoorData.java @@ -1,6 +1,6 @@ -package electrosphere.data.furniture; +package electrosphere.data.entity.furniture; -import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.entity.common.treedata.TreeDataState; /** * Data about how a door functions diff --git a/src/main/java/electrosphere/data/furniture/FurnitureData.java b/src/main/java/electrosphere/data/entity/furniture/FurnitureData.java similarity index 87% rename from src/main/java/electrosphere/data/furniture/FurnitureData.java rename to src/main/java/electrosphere/data/entity/furniture/FurnitureData.java index 8c774849..e9a20ea1 100644 --- a/src/main/java/electrosphere/data/furniture/FurnitureData.java +++ b/src/main/java/electrosphere/data/entity/furniture/FurnitureData.java @@ -1,4 +1,4 @@ -package electrosphere.data.furniture; +package electrosphere.data.entity.furniture; /** * Data controlling furniture behavior diff --git a/src/main/java/electrosphere/data/graphics/GraphicsTemplate.java b/src/main/java/electrosphere/data/entity/graphics/GraphicsTemplate.java similarity index 95% rename from src/main/java/electrosphere/data/graphics/GraphicsTemplate.java rename to src/main/java/electrosphere/data/entity/graphics/GraphicsTemplate.java index 5fdb50a2..bd6cb8fa 100644 --- a/src/main/java/electrosphere/data/graphics/GraphicsTemplate.java +++ b/src/main/java/electrosphere/data/entity/graphics/GraphicsTemplate.java @@ -1,4 +1,4 @@ -package electrosphere.data.graphics; +package electrosphere.data.entity.graphics; /** * A graphics template for an entity diff --git a/src/main/java/electrosphere/data/graphics/NonproceduralModel.java b/src/main/java/electrosphere/data/entity/graphics/NonproceduralModel.java similarity index 95% rename from src/main/java/electrosphere/data/graphics/NonproceduralModel.java rename to src/main/java/electrosphere/data/entity/graphics/NonproceduralModel.java index cc19b1e4..eaa22fcb 100644 --- a/src/main/java/electrosphere/data/graphics/NonproceduralModel.java +++ b/src/main/java/electrosphere/data/entity/graphics/NonproceduralModel.java @@ -1,10 +1,10 @@ -package electrosphere.data.graphics; +package electrosphere.data.entity.graphics; import java.util.Map; import org.joml.Vector3f; -import electrosphere.data.creature.IdleData; +import electrosphere.data.entity.creature.IdleData; /** * A non-procedural model diff --git a/src/main/java/electrosphere/data/graphics/ProceduralModel.java b/src/main/java/electrosphere/data/entity/graphics/ProceduralModel.java similarity index 79% rename from src/main/java/electrosphere/data/graphics/ProceduralModel.java rename to src/main/java/electrosphere/data/entity/graphics/ProceduralModel.java index 23f447b2..ca6707e2 100644 --- a/src/main/java/electrosphere/data/graphics/ProceduralModel.java +++ b/src/main/java/electrosphere/data/entity/graphics/ProceduralModel.java @@ -1,6 +1,6 @@ -package electrosphere.data.graphics; +package electrosphere.data.entity.graphics; -import electrosphere.data.foliage.TreeModel; +import electrosphere.data.entity.foliage.TreeModel; /** * A procedurally-generated model diff --git a/src/main/java/electrosphere/data/graphics/ShaderSet.java b/src/main/java/electrosphere/data/entity/graphics/ShaderSet.java similarity index 87% rename from src/main/java/electrosphere/data/graphics/ShaderSet.java rename to src/main/java/electrosphere/data/entity/graphics/ShaderSet.java index 10bb36ec..62a22ca7 100644 --- a/src/main/java/electrosphere/data/graphics/ShaderSet.java +++ b/src/main/java/electrosphere/data/entity/graphics/ShaderSet.java @@ -1,4 +1,4 @@ -package electrosphere.data.graphics; +package electrosphere.data.entity.graphics; public class ShaderSet { diff --git a/src/main/java/electrosphere/data/grident/GridAlignedData.java b/src/main/java/electrosphere/data/entity/grident/GridAlignedData.java similarity index 97% rename from src/main/java/electrosphere/data/grident/GridAlignedData.java rename to src/main/java/electrosphere/data/entity/grident/GridAlignedData.java index bbdfc605..ab4dbcea 100644 --- a/src/main/java/electrosphere/data/grident/GridAlignedData.java +++ b/src/main/java/electrosphere/data/entity/grident/GridAlignedData.java @@ -1,4 +1,4 @@ -package electrosphere.data.grident; +package electrosphere.data.entity.grident; /** * Data for aligning this entity with the block grid diff --git a/src/main/java/electrosphere/data/item/EquipData.java b/src/main/java/electrosphere/data/entity/item/EquipData.java similarity index 96% rename from src/main/java/electrosphere/data/item/EquipData.java rename to src/main/java/electrosphere/data/entity/item/EquipData.java index 466618b1..d9385d53 100644 --- a/src/main/java/electrosphere/data/item/EquipData.java +++ b/src/main/java/electrosphere/data/entity/item/EquipData.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; import java.util.List; diff --git a/src/main/java/electrosphere/data/item/EquipWhitelist.java b/src/main/java/electrosphere/data/entity/item/EquipWhitelist.java similarity index 91% rename from src/main/java/electrosphere/data/item/EquipWhitelist.java rename to src/main/java/electrosphere/data/entity/item/EquipWhitelist.java index 75eec4bc..2eef9814 100644 --- a/src/main/java/electrosphere/data/item/EquipWhitelist.java +++ b/src/main/java/electrosphere/data/entity/item/EquipWhitelist.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; import java.util.List; diff --git a/src/main/java/electrosphere/data/item/Item.java b/src/main/java/electrosphere/data/entity/item/Item.java similarity index 97% rename from src/main/java/electrosphere/data/item/Item.java rename to src/main/java/electrosphere/data/entity/item/Item.java index 8c4985ae..92970337 100644 --- a/src/main/java/electrosphere/data/item/Item.java +++ b/src/main/java/electrosphere/data/entity/item/Item.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; import java.util.Arrays; import java.util.HashMap; @@ -8,10 +8,10 @@ import java.util.Map; import electrosphere.controls.cursor.CursorState; import electrosphere.data.block.BlockType; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.common.item.SpawnItemDescription; -import electrosphere.data.graphics.GraphicsTemplate; -import electrosphere.data.graphics.NonproceduralModel; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.common.item.SpawnItemDescription; +import electrosphere.data.entity.graphics.GraphicsTemplate; +import electrosphere.data.entity.graphics.NonproceduralModel; import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; diff --git a/src/main/java/electrosphere/data/item/ItemAudio.java b/src/main/java/electrosphere/data/entity/item/ItemAudio.java similarity index 94% rename from src/main/java/electrosphere/data/item/ItemAudio.java rename to src/main/java/electrosphere/data/entity/item/ItemAudio.java index c7377121..8400e1e6 100644 --- a/src/main/java/electrosphere/data/item/ItemAudio.java +++ b/src/main/java/electrosphere/data/entity/item/ItemAudio.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; /** * Audio data related to the item diff --git a/src/main/java/electrosphere/data/item/ItemDataFile.java b/src/main/java/electrosphere/data/entity/item/ItemDataFile.java similarity index 96% rename from src/main/java/electrosphere/data/item/ItemDataFile.java rename to src/main/java/electrosphere/data/entity/item/ItemDataFile.java index db9d9d57..11fc5af5 100644 --- a/src/main/java/electrosphere/data/item/ItemDataFile.java +++ b/src/main/java/electrosphere/data/entity/item/ItemDataFile.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; import java.util.List; diff --git a/src/main/java/electrosphere/data/item/ItemDataMap.java b/src/main/java/electrosphere/data/entity/item/ItemDataMap.java similarity index 97% rename from src/main/java/electrosphere/data/item/ItemDataMap.java rename to src/main/java/electrosphere/data/entity/item/ItemDataMap.java index fdef65fc..67426b2a 100644 --- a/src/main/java/electrosphere/data/item/ItemDataMap.java +++ b/src/main/java/electrosphere/data/entity/item/ItemDataMap.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; import java.util.Collection; import java.util.HashMap; @@ -9,10 +9,10 @@ import java.util.Set; import electrosphere.data.block.BlockData; import electrosphere.data.block.BlockType; -import electrosphere.data.common.CommonEntityMap; -import electrosphere.data.common.CommonEntityType; import electrosphere.data.crafting.RecipeData; import electrosphere.data.crafting.RecipeDataMap; +import electrosphere.data.entity.common.CommonEntityMap; +import electrosphere.data.entity.common.CommonEntityType; import electrosphere.data.voxel.VoxelData; import electrosphere.data.voxel.VoxelType; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/data/item/ItemFabData.java b/src/main/java/electrosphere/data/entity/item/ItemFabData.java similarity index 93% rename from src/main/java/electrosphere/data/item/ItemFabData.java rename to src/main/java/electrosphere/data/entity/item/ItemFabData.java index cab870a9..b9bc082c 100644 --- a/src/main/java/electrosphere/data/item/ItemFabData.java +++ b/src/main/java/electrosphere/data/entity/item/ItemFabData.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; /** * Data for placing fabs diff --git a/src/main/java/electrosphere/data/item/ItemIdStrings.java b/src/main/java/electrosphere/data/entity/item/ItemIdStrings.java similarity index 81% rename from src/main/java/electrosphere/data/item/ItemIdStrings.java rename to src/main/java/electrosphere/data/entity/item/ItemIdStrings.java index 5c0749ee..1edff4f8 100644 --- a/src/main/java/electrosphere/data/item/ItemIdStrings.java +++ b/src/main/java/electrosphere/data/entity/item/ItemIdStrings.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; /** * Hardcoded item ids for items diff --git a/src/main/java/electrosphere/data/item/ItemUsage.java b/src/main/java/electrosphere/data/entity/item/ItemUsage.java similarity index 98% rename from src/main/java/electrosphere/data/item/ItemUsage.java rename to src/main/java/electrosphere/data/entity/item/ItemUsage.java index 7758d360..8ce56f48 100644 --- a/src/main/java/electrosphere/data/item/ItemUsage.java +++ b/src/main/java/electrosphere/data/entity/item/ItemUsage.java @@ -1,4 +1,4 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; /** * Defines what a given use action does with an item diff --git a/src/main/java/electrosphere/data/item/WeaponData.java b/src/main/java/electrosphere/data/entity/item/WeaponData.java similarity index 94% rename from src/main/java/electrosphere/data/item/WeaponData.java rename to src/main/java/electrosphere/data/entity/item/WeaponData.java index 3e2db956..64bb838c 100644 --- a/src/main/java/electrosphere/data/item/WeaponData.java +++ b/src/main/java/electrosphere/data/entity/item/WeaponData.java @@ -1,8 +1,8 @@ -package electrosphere.data.item; +package electrosphere.data.entity.item; import java.util.List; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.HitboxData; /** * Data about a weapon diff --git a/src/main/java/electrosphere/data/item/source/ItemSourcingData.java b/src/main/java/electrosphere/data/entity/item/source/ItemSourcingData.java similarity index 93% rename from src/main/java/electrosphere/data/item/source/ItemSourcingData.java rename to src/main/java/electrosphere/data/entity/item/source/ItemSourcingData.java index c6f593d8..b12a688e 100644 --- a/src/main/java/electrosphere/data/item/source/ItemSourcingData.java +++ b/src/main/java/electrosphere/data/entity/item/source/ItemSourcingData.java @@ -1,10 +1,10 @@ -package electrosphere.data.item.source; +package electrosphere.data.entity.item.source; import java.util.List; -import electrosphere.data.common.CommonEntityType; import electrosphere.data.crafting.RecipeData; -import electrosphere.data.foliage.FoliageType; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.foliage.FoliageType; /** * Data that stores how an item can be sources diff --git a/src/main/java/electrosphere/data/item/source/ItemSourcingMap.java b/src/main/java/electrosphere/data/entity/item/source/ItemSourcingMap.java similarity index 90% rename from src/main/java/electrosphere/data/item/source/ItemSourcingMap.java rename to src/main/java/electrosphere/data/entity/item/source/ItemSourcingMap.java index 64d74eb9..3d437c0b 100644 --- a/src/main/java/electrosphere/data/item/source/ItemSourcingMap.java +++ b/src/main/java/electrosphere/data/entity/item/source/ItemSourcingMap.java @@ -1,4 +1,4 @@ -package electrosphere.data.item.source; +package electrosphere.data.entity.item.source; import java.util.HashMap; import java.util.LinkedList; @@ -6,17 +6,17 @@ import java.util.List; import java.util.Map; import electrosphere.data.Config; -import electrosphere.data.common.CommonEntityTokens; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.common.life.loot.LootPool; -import electrosphere.data.common.life.loot.LootTicket; import electrosphere.data.crafting.RecipeData; import electrosphere.data.crafting.RecipeDataMap; import electrosphere.data.crafting.RecipeIngredientData; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.foliage.FoliageTypeLoader; -import electrosphere.data.item.Item; -import electrosphere.data.item.ItemDataMap; +import electrosphere.data.entity.common.CommonEntityTokens; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.common.life.loot.LootPool; +import electrosphere.data.entity.common.life.loot.LootTicket; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.foliage.FoliageTypeLoader; +import electrosphere.data.entity.item.Item; +import electrosphere.data.entity.item.ItemDataMap; /** * Map of items to the methods to source them diff --git a/src/main/java/electrosphere/data/item/source/ItemSourcingTree.java b/src/main/java/electrosphere/data/entity/item/source/ItemSourcingTree.java similarity index 97% rename from src/main/java/electrosphere/data/item/source/ItemSourcingTree.java rename to src/main/java/electrosphere/data/entity/item/source/ItemSourcingTree.java index 015fdbac..463f2ee1 100644 --- a/src/main/java/electrosphere/data/item/source/ItemSourcingTree.java +++ b/src/main/java/electrosphere/data/entity/item/source/ItemSourcingTree.java @@ -1,4 +1,4 @@ -package electrosphere.data.item.source; +package electrosphere.data.entity.item.source; import java.util.HashMap; import java.util.LinkedList; @@ -6,10 +6,10 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import electrosphere.data.common.CommonEntityTokens; import electrosphere.data.crafting.RecipeData; import electrosphere.data.crafting.RecipeIngredientData; -import electrosphere.data.item.ItemIdStrings; +import electrosphere.data.entity.common.CommonEntityTokens; +import electrosphere.data.entity.item.ItemIdStrings; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; diff --git a/src/main/java/electrosphere/data/particle/ParticleData.java b/src/main/java/electrosphere/data/entity/particle/ParticleData.java similarity index 98% rename from src/main/java/electrosphere/data/particle/ParticleData.java rename to src/main/java/electrosphere/data/entity/particle/ParticleData.java index 8a5db6d3..bd787e13 100644 --- a/src/main/java/electrosphere/data/particle/ParticleData.java +++ b/src/main/java/electrosphere/data/entity/particle/ParticleData.java @@ -1,4 +1,4 @@ -package electrosphere.data.particle; +package electrosphere.data.entity.particle; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/data/particle/ParticleDefinition.java b/src/main/java/electrosphere/data/entity/particle/ParticleDefinition.java similarity index 88% rename from src/main/java/electrosphere/data/particle/ParticleDefinition.java rename to src/main/java/electrosphere/data/entity/particle/ParticleDefinition.java index 2ef73635..81272178 100644 --- a/src/main/java/electrosphere/data/particle/ParticleDefinition.java +++ b/src/main/java/electrosphere/data/entity/particle/ParticleDefinition.java @@ -1,4 +1,4 @@ -package electrosphere.data.particle; +package electrosphere.data.entity.particle; import java.util.List; diff --git a/src/main/java/electrosphere/data/particle/ParticleEmitter.java b/src/main/java/electrosphere/data/entity/particle/ParticleEmitter.java similarity index 99% rename from src/main/java/electrosphere/data/particle/ParticleEmitter.java rename to src/main/java/electrosphere/data/entity/particle/ParticleEmitter.java index 743d3222..5e7ea1c8 100644 --- a/src/main/java/electrosphere/data/particle/ParticleEmitter.java +++ b/src/main/java/electrosphere/data/entity/particle/ParticleEmitter.java @@ -1,4 +1,4 @@ -package electrosphere.data.particle; +package electrosphere.data.entity.particle; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/data/projectile/ProjectileType.java b/src/main/java/electrosphere/data/entity/projectile/ProjectileType.java similarity index 92% rename from src/main/java/electrosphere/data/projectile/ProjectileType.java rename to src/main/java/electrosphere/data/entity/projectile/ProjectileType.java index 0b17f486..43e8f82b 100644 --- a/src/main/java/electrosphere/data/projectile/ProjectileType.java +++ b/src/main/java/electrosphere/data/entity/projectile/ProjectileType.java @@ -1,4 +1,4 @@ -package electrosphere.data.projectile; +package electrosphere.data.entity.projectile; public class ProjectileType { diff --git a/src/main/java/electrosphere/data/projectile/ProjectileTypeHolder.java b/src/main/java/electrosphere/data/entity/projectile/ProjectileTypeHolder.java similarity index 91% rename from src/main/java/electrosphere/data/projectile/ProjectileTypeHolder.java rename to src/main/java/electrosphere/data/entity/projectile/ProjectileTypeHolder.java index 05de590a..a573bd36 100644 --- a/src/main/java/electrosphere/data/projectile/ProjectileTypeHolder.java +++ b/src/main/java/electrosphere/data/entity/projectile/ProjectileTypeHolder.java @@ -1,4 +1,4 @@ -package electrosphere.data.projectile; +package electrosphere.data.entity.projectile; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/electrosphere/data/units/UnitDefinition.java b/src/main/java/electrosphere/data/units/UnitDefinition.java index 21264f8f..d3aeb7e4 100644 --- a/src/main/java/electrosphere/data/units/UnitDefinition.java +++ b/src/main/java/electrosphere/data/units/UnitDefinition.java @@ -2,7 +2,7 @@ package electrosphere.data.units; import java.util.List; -import electrosphere.data.creature.ai.AITreeData; +import electrosphere.data.entity.creature.ai.AITreeData; /** * A creature associated with some equipment and AI diff --git a/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java b/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java index 6d7aabdc..0b104463 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java @@ -13,7 +13,7 @@ import electrosphere.client.block.cells.BlockTextureAtlas; import electrosphere.client.terrain.cells.VoxelTextureAtlas; import electrosphere.data.block.BlockData; import electrosphere.data.block.BlockType; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.data.voxel.VoxelData; import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; diff --git a/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java b/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java index b2f671de..fdae32af 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java @@ -12,8 +12,8 @@ import org.joml.Vector3f; import org.joml.Vector3i; import electrosphere.auth.AuthenticationManager; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; import electrosphere.engine.EngineState; import electrosphere.engine.Globals; import electrosphere.engine.threads.LabeledThread.ThreadLabel; diff --git a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java index 87baf563..0ab38c40 100644 --- a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java +++ b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java @@ -3,9 +3,9 @@ package electrosphere.entity.btree; import java.util.function.Supplier; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.common.treedata.TreeDataAudio; -import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAudio; +import electrosphere.data.entity.common.treedata.TreeDataState; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java index 8023c958..b1dcc9d3 100644 --- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java @@ -1,9 +1,9 @@ package electrosphere.entity.state.attack; -import electrosphere.data.common.treedata.TreeDataState; -import electrosphere.data.creature.attack.AttackMove; -import electrosphere.data.item.WeaponData; +import electrosphere.data.entity.common.treedata.TreeDataState; +import electrosphere.data.entity.creature.attack.AttackMove; +import electrosphere.data.entity.item.WeaponData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java index 6eaf9d99..6b99d548 100644 --- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java @@ -4,10 +4,10 @@ package electrosphere.entity.state.attack; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.server.datacell.utils.DataCellSearchUtils; -import electrosphere.data.common.treedata.TreeDataState; -import electrosphere.data.creature.attack.AttackMove; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.item.WeaponData; +import electrosphere.data.entity.common.treedata.TreeDataState; +import electrosphere.data.entity.creature.attack.AttackMove; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.item.WeaponData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java index b2185c17..d8ce4c0d 100644 --- a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java @@ -1,8 +1,8 @@ package electrosphere.entity.state.block; -import electrosphere.data.creature.block.BlockSystem; -import electrosphere.data.creature.block.BlockVariant; +import electrosphere.data.entity.creature.block.BlockSystem; +import electrosphere.data.entity.creature.block.BlockVariant; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java index 10dbe65a..39ebf749 100644 --- a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java @@ -3,8 +3,8 @@ package electrosphere.entity.state.block; import java.util.List; -import electrosphere.data.creature.block.BlockSystem; -import electrosphere.data.creature.block.BlockVariant; +import electrosphere.data.entity.creature.block.BlockSystem; +import electrosphere.data.entity.creature.block.BlockVariant; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java b/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java index a2f080aa..e34d9fbe 100644 --- a/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java +++ b/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java @@ -4,7 +4,7 @@ import org.joml.Vector3d; import electrosphere.audio.VirtualAudioSource; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; -import electrosphere.data.foliage.AmbientAudio; +import electrosphere.data.entity.foliage.AmbientAudio; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java b/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java index 74b0ee0a..82aef223 100644 --- a/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java +++ b/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java @@ -1,6 +1,6 @@ package electrosphere.entity.state.client.firstPerson; -import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java index 542d65bd..4cbfb32d 100644 --- a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java +++ b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java @@ -4,8 +4,8 @@ import org.joml.Quaterniond; import org.joml.Random; import org.joml.Vector3d; -import electrosphere.data.particle.ParticleData; -import electrosphere.data.particle.ParticleEmitter; +import electrosphere.data.entity.particle.ParticleData; +import electrosphere.data.entity.particle.ParticleEmitter; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java index f0456d5f..328f5c59 100644 --- a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java +++ b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java @@ -10,8 +10,8 @@ import org.joml.Vector3f; import org.joml.Vector4f; import electrosphere.client.entity.camera.CameraEntityUtils; -import electrosphere.data.particle.ParticleData; -import electrosphere.data.particle.ParticleEmitter; +import electrosphere.data.entity.particle.ParticleData; +import electrosphere.data.entity.particle.ParticleEmitter; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java index bbf85944..d44339c3 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java @@ -8,10 +8,10 @@ import java.util.Map; import java.util.Map.Entry; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.item.EquipWhitelist; -import electrosphere.data.item.Item; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.item.EquipWhitelist; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java b/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java index 56611d4a..4e61b160 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java +++ b/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java @@ -16,11 +16,11 @@ import electrosphere.client.ui.menu.ingame.ToolbarPreviewWindow; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.controls.cursor.CursorState; import electrosphere.data.block.fab.BlockFab; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.creature.equip.ToolbarData; -import electrosphere.data.item.EquipWhitelist; -import electrosphere.data.item.Item; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.creature.equip.ToolbarData; +import electrosphere.data.entity.item.EquipWhitelist; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.ClientEntityUtils; diff --git a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java index f856d5c3..d5dfb41e 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java @@ -11,11 +11,11 @@ import java.util.Map; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.block.BlockSystem; -import electrosphere.data.creature.block.BlockVariant; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.item.EquipWhitelist; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.block.BlockSystem; +import electrosphere.data.entity.creature.block.BlockVariant; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.item.EquipWhitelist; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java b/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java index 4c9cd97e..bd037dfd 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java +++ b/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java @@ -16,11 +16,11 @@ import java.util.List; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.creature.block.BlockSystem; -import electrosphere.data.creature.block.BlockVariant; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.creature.equip.ToolbarData; -import electrosphere.data.item.EquipWhitelist; +import electrosphere.data.entity.creature.block.BlockSystem; +import electrosphere.data.entity.creature.block.BlockVariant; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.creature.equip.ToolbarData; +import electrosphere.data.entity.item.EquipWhitelist; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java index 00ef44f0..5e7c1f51 100644 --- a/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java +++ b/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java @@ -5,7 +5,7 @@ import org.joml.Quaterniond; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.furniture.DoorData; +import electrosphere.data.entity.furniture.DoorData; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java index af6d5fd0..26576f53 100644 --- a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java +++ b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java @@ -4,7 +4,7 @@ package electrosphere.entity.state.furniture; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.furniture.DoorData; +import electrosphere.data.entity.furniture.DoorData; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java b/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java index 40bdc885..3eb6aed1 100644 --- a/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java +++ b/src/main/java/electrosphere/entity/state/growth/ClientGrowthComponent.java @@ -3,7 +3,7 @@ package electrosphere.entity.state.growth; import org.joml.Vector3d; -import electrosphere.data.foliage.GrowthData; +import electrosphere.data.entity.foliage.GrowthData; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; diff --git a/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java b/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java index 2b3cf06e..845fa279 100644 --- a/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java +++ b/src/main/java/electrosphere/entity/state/growth/ServerGrowthComponent.java @@ -3,7 +3,7 @@ package electrosphere.entity.state.growth; import org.joml.Vector3d; -import electrosphere.data.foliage.GrowthData; +import electrosphere.data.entity.foliage.GrowthData; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.ServerEntityUtils; diff --git a/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java b/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java index 0c664f2e..04246d69 100644 --- a/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java +++ b/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java @@ -17,7 +17,7 @@ import electrosphere.collision.PhysicsUtils; import electrosphere.collision.collidable.Collidable; import electrosphere.collision.hitbox.HitboxManager; import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback; -import electrosphere.data.collidable.HitboxData; +import electrosphere.data.entity.collidable.HitboxData; import electrosphere.data.utils.DataFormatUtil; import electrosphere.engine.Globals; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java index 58131d2e..2a6426d1 100644 --- a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java @@ -4,7 +4,7 @@ package electrosphere.entity.state.idle; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; -import electrosphere.data.creature.IdleData; +import electrosphere.data.entity.creature.IdleData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java index af5315b2..69afd495 100644 --- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java @@ -6,7 +6,7 @@ import electrosphere.entity.state.attack.ServerAttackTree; import electrosphere.entity.state.idle.ClientIdleTree.IdleTreeState; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; -import electrosphere.data.creature.IdleData; +import electrosphere.data.entity.creature.IdleData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java index a46c80d9..7fac02ee 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java @@ -6,8 +6,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; import electrosphere.client.ui.menu.WindowUtils; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.item.Item; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.ClientEntityUtils; diff --git a/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java index a2dab87d..04ec91d7 100644 --- a/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java @@ -6,7 +6,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.entity.creature.equip.EquipPoint; import electrosphere.entity.Entity; import electrosphere.entity.types.item.ItemUtils; import electrosphere.logger.LoggerInterface; diff --git a/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java index 1aec3164..c2dc0d22 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java @@ -5,8 +5,8 @@ import java.util.List; import org.joml.Vector3d; -import electrosphere.data.creature.equip.EquipPoint; -import electrosphere.data.item.Item; +import electrosphere.data.entity.creature.equip.EquipPoint; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java index 67dbf34f..2f2fc51c 100644 --- a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java +++ b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java @@ -6,7 +6,7 @@ import electrosphere.entity.btree.StateTransitionUtil; import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.Entity; -import electrosphere.data.common.life.HealthSystem; +import electrosphere.data.entity.common.life.HealthSystem; import electrosphere.engine.Globals; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; diff --git a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java index 04001fdc..843b40e9 100644 --- a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java +++ b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java @@ -20,10 +20,10 @@ import java.util.Random; import org.joml.Vector3d; -import electrosphere.data.collidable.HitboxData; -import electrosphere.data.common.life.HealthSystem; -import electrosphere.data.common.life.loot.LootPool; -import electrosphere.data.common.life.loot.LootTicket; +import electrosphere.data.entity.collidable.HitboxData; +import electrosphere.data.entity.common.life.HealthSystem; +import electrosphere.data.entity.common.life.loot.LootPool; +import electrosphere.data.entity.common.life.loot.LootTicket; import electrosphere.engine.Globals; import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState; import electrosphere.entity.state.life.ClientLifeTree.LifeStateEnum; diff --git a/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java b/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java index 1ca87b96..ea368b23 100644 --- a/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java +++ b/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java @@ -3,7 +3,7 @@ package electrosphere.entity.state.light; import org.joml.Vector3d; import org.joml.Vector3f; -import electrosphere.data.common.light.PointLightDescription; +import electrosphere.data.entity.common.light.PointLightDescription; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java index c59decd6..cdef0503 100644 --- a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java @@ -2,7 +2,7 @@ package electrosphere.entity.state.movement.editor; import electrosphere.entity.state.gravity.GravityUtils; -import electrosphere.data.creature.movement.EditorMovementSystem; +import electrosphere.data.entity.creature.movement.EditorMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java index 8f2249cc..8e346173 100644 --- a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java @@ -5,7 +5,7 @@ import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.client.entity.camera.CameraEntityUtils; -import electrosphere.data.creature.movement.EditorMovementSystem; +import electrosphere.data.entity.creature.movement.EditorMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java index f54415d0..8f0bc2ce 100644 --- a/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java @@ -2,7 +2,7 @@ package electrosphere.entity.state.movement.fall; import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; -import electrosphere.data.creature.movement.FallMovementSystem; +import electrosphere.data.entity.creature.movement.FallMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java index b762373a..4dbda3ff 100644 --- a/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java @@ -1,7 +1,7 @@ package electrosphere.entity.state.movement.fall; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.movement.FallMovementSystem; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.movement.FallMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java index 39601dc8..70fc2b1e 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java @@ -6,7 +6,7 @@ import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.creature.movement.GroundMovementSystem; +import electrosphere.data.entity.creature.movement.GroundMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.collision.CollisionObjUtils; import electrosphere.entity.types.creature.CreatureUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java index c6e4d7c0..0029543f 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java @@ -8,7 +8,7 @@ import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.creature.movement.GroundMovementSystem; +import electrosphere.data.entity.creature.movement.GroundMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java index d6765bf7..404fa87f 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java @@ -9,7 +9,7 @@ import org.ode4j.ode.DBody; import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.creature.movement.JumpMovementSystem; +import electrosphere.data.entity.creature.movement.JumpMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java index 16aa64de..b3cd0044 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java @@ -10,7 +10,7 @@ import org.ode4j.math.DVector3C; import org.ode4j.ode.DBody; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.creature.movement.JumpMovementSystem; +import electrosphere.data.entity.creature.movement.JumpMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java index d0ff1d2c..41aaa4c5 100644 --- a/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java +++ b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java @@ -1,7 +1,7 @@ package electrosphere.entity.state.movement.sprint; -import electrosphere.data.creature.SprintSystem; +import electrosphere.data.entity.creature.SprintSystem; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.server.ServerSynchronizationManager; diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java index fab84437..fc009f68 100644 --- a/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java +++ b/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java @@ -4,7 +4,7 @@ package electrosphere.entity.state.movement.sprint; import electrosphere.net.synchronization.enums.FieldIdEnums; import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.net.parser.net.message.SynchronizationMessage; -import electrosphere.data.creature.SprintSystem; +import electrosphere.data.entity.creature.SprintSystem; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; diff --git a/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java index 1472f004..1212fd41 100644 --- a/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java +++ b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java @@ -4,7 +4,7 @@ package electrosphere.entity.state.movement.walk; import electrosphere.net.synchronization.server.ServerSynchronizationManager; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; -import electrosphere.data.creature.movement.WalkMovementSystem; +import electrosphere.data.entity.creature.movement.WalkMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java index 4296c26c..8a5a53ab 100644 --- a/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java +++ b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java @@ -1,7 +1,7 @@ package electrosphere.entity.state.movement.walk; -import electrosphere.data.creature.movement.WalkMovementSystem; +import electrosphere.data.entity.creature.movement.WalkMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.enums.FieldIdEnums; diff --git a/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java b/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java index 5547cba6..67bb39a7 100644 --- a/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java +++ b/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java @@ -8,7 +8,7 @@ public class RotatorConstraint { float allowedMarginPitch; float allowedMarginYaw; - public RotatorConstraint(electrosphere.data.creature.rotator.RotatorConstraint data){ + public RotatorConstraint(electrosphere.data.entity.creature.rotator.RotatorConstraint data){ followsBone = data.getFollowsBone(); followsView = data.getFollowsView(); parentBone = data.getParentBone(); diff --git a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java index a72b0e98..004694e1 100644 --- a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java +++ b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java @@ -12,23 +12,23 @@ import org.ode4j.ode.DBody; import electrosphere.client.interact.ClientInteractionEngine; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.collidable.CollidableTemplate; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.SprintSystem; -import electrosphere.data.creature.attack.AttackMove; -import electrosphere.data.creature.movement.EditorMovementSystem; -import electrosphere.data.creature.movement.FallMovementSystem; -import electrosphere.data.creature.movement.GroundMovementSystem; -import electrosphere.data.creature.movement.JumpMovementSystem; -import electrosphere.data.creature.movement.MovementSystem; -import electrosphere.data.creature.movement.WalkMovementSystem; -import electrosphere.data.creature.rotator.RotatorConstraint; -import electrosphere.data.creature.rotator.RotatorItem; -import electrosphere.data.creature.rotator.RotatorSystem; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.graphics.GraphicsTemplate; -import electrosphere.data.item.Item; +import electrosphere.data.entity.collidable.CollidableTemplate; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.SprintSystem; +import electrosphere.data.entity.creature.attack.AttackMove; +import electrosphere.data.entity.creature.movement.EditorMovementSystem; +import electrosphere.data.entity.creature.movement.FallMovementSystem; +import electrosphere.data.entity.creature.movement.GroundMovementSystem; +import electrosphere.data.entity.creature.movement.JumpMovementSystem; +import electrosphere.data.entity.creature.movement.MovementSystem; +import electrosphere.data.entity.creature.movement.WalkMovementSystem; +import electrosphere.data.entity.creature.rotator.RotatorConstraint; +import electrosphere.data.entity.creature.rotator.RotatorItem; +import electrosphere.data.entity.creature.rotator.RotatorSystem; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.graphics.GraphicsTemplate; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.PhysicsMeshQueueItem; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java index 53affea9..47b0c879 100644 --- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java +++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java @@ -5,9 +5,9 @@ import java.util.Map.Entry; import org.joml.Quaterniond; import org.joml.Vector3d; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.visualattribute.AttributeVariant; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.visualattribute.AttributeVariant; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; diff --git a/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java b/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java index 6f951ef5..debc50ba 100644 --- a/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java +++ b/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java @@ -3,8 +3,8 @@ package electrosphere.entity.types.creature; import java.util.HashMap; import java.util.Map; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.net.synchronization.transport.StateCollection; diff --git a/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java b/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java index 68f7b9a4..399fe6d2 100644 --- a/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java +++ b/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java @@ -1,7 +1,7 @@ package electrosphere.entity.types.foliage; -import electrosphere.data.foliage.AmbientAudio; -import electrosphere.data.foliage.FoliageType; +import electrosphere.data.entity.foliage.AmbientAudio; +import electrosphere.data.entity.foliage.FoliageType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; diff --git a/src/main/java/electrosphere/entity/types/item/ItemUtils.java b/src/main/java/electrosphere/entity/types/item/ItemUtils.java index 2967e625..0c7eca6e 100644 --- a/src/main/java/electrosphere/entity/types/item/ItemUtils.java +++ b/src/main/java/electrosphere/entity/types/item/ItemUtils.java @@ -8,11 +8,11 @@ import org.ode4j.ode.DBody; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.item.EquipData; -import electrosphere.data.item.EquipWhitelist; -import electrosphere.data.item.Item; -import electrosphere.data.item.ItemAudio; -import electrosphere.data.item.WeaponData; +import electrosphere.data.entity.item.EquipData; +import electrosphere.data.entity.item.EquipWhitelist; +import electrosphere.data.entity.item.Item; +import electrosphere.data.entity.item.ItemAudio; +import electrosphere.data.entity.item.WeaponData; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.ClientEntityUtils; diff --git a/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java b/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java index 128f4689..0a45d515 100644 --- a/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java +++ b/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java @@ -8,8 +8,8 @@ import org.joml.Vector3d; import org.joml.Vector3f; import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback; -import electrosphere.data.collidable.HitboxData; -import electrosphere.data.projectile.ProjectileType; +import electrosphere.data.entity.collidable.HitboxData; +import electrosphere.data.entity.projectile.ProjectileType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; diff --git a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java index 88529b76..eca0d44f 100644 --- a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java +++ b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java @@ -19,10 +19,10 @@ import electrosphere.client.entity.instance.InstancedEntityUtils; import electrosphere.collision.CollisionBodyCreation; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.foliage.ProceduralTreeBranchModel; -import electrosphere.data.foliage.ProceduralTreeTrunkModel; -import electrosphere.data.foliage.TreeModel; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.foliage.ProceduralTreeBranchModel; +import electrosphere.data.entity.foliage.ProceduralTreeTrunkModel; +import electrosphere.data.entity.foliage.TreeModel; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java b/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java index 0feb1a2c..f30583e6 100644 --- a/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java +++ b/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java @@ -6,8 +6,8 @@ import java.util.List; import org.joml.Quaterniond; import org.joml.Vector3d; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.ViewModelData; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.ViewModelData; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java b/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java index 6548ccdf..ab613471 100644 --- a/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java +++ b/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java @@ -10,8 +10,8 @@ import com.google.gson.Gson; import electrosphere.client.entity.character.CharacterDescriptionDTO; import electrosphere.client.entity.character.ClientCharacterListDTO; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.visualattribute.VisualAttribute; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.engine.loadingthreads.LoadingUtils; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/renderer/actor/Actor.java b/src/main/java/electrosphere/renderer/actor/Actor.java index 93739d42..3e89aabb 100644 --- a/src/main/java/electrosphere/renderer/actor/Actor.java +++ b/src/main/java/electrosphere/renderer/actor/Actor.java @@ -1,7 +1,7 @@ package electrosphere.renderer.actor; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.bonegroups.BoneGroup; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.bonegroups.BoneGroup; import electrosphere.engine.Globals; import electrosphere.entity.state.AnimationPriorities; import electrosphere.logger.LoggerInterface; diff --git a/src/main/java/electrosphere/renderer/light/LightManager.java b/src/main/java/electrosphere/renderer/light/LightManager.java index dfedea49..10c598d7 100644 --- a/src/main/java/electrosphere/renderer/light/LightManager.java +++ b/src/main/java/electrosphere/renderer/light/LightManager.java @@ -10,7 +10,7 @@ import org.joml.Vector3f; import org.joml.Vector3i; import electrosphere.client.entity.camera.CameraEntityUtils; -import electrosphere.data.common.light.PointLightDescription; +import electrosphere.data.entity.common.light.PointLightDescription; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/renderer/light/PointLight.java b/src/main/java/electrosphere/renderer/light/PointLight.java index 4c0f1c42..061f218e 100644 --- a/src/main/java/electrosphere/renderer/light/PointLight.java +++ b/src/main/java/electrosphere/renderer/light/PointLight.java @@ -2,7 +2,7 @@ package electrosphere.renderer.light; import org.joml.Vector3f; -import electrosphere.data.common.light.PointLightDescription; +import electrosphere.data.entity.common.light.PointLightDescription; /** * Data about a point light diff --git a/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java b/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java index c8e3d88f..6f809bb9 100644 --- a/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java +++ b/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java @@ -20,10 +20,10 @@ import electrosphere.collision.collidable.Collidable; import electrosphere.data.block.fab.FurnitureSlotMetadata; import electrosphere.data.block.fab.RoomMetadata; import electrosphere.data.block.fab.StructureMetadata; -import electrosphere.data.collidable.CollidableTemplate; -import electrosphere.data.collidable.HitboxData; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.grident.GridAlignedData; +import electrosphere.data.entity.collidable.CollidableTemplate; +import electrosphere.data.entity.collidable.HitboxData; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.grident.GridAlignedData; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/server/ai/AI.java b/src/main/java/electrosphere/server/ai/AI.java index 3f014cbe..7ce8cbe1 100644 --- a/src/main/java/electrosphere/server/ai/AI.java +++ b/src/main/java/electrosphere/server/ai/AI.java @@ -3,10 +3,10 @@ package electrosphere.server.ai; import java.util.LinkedList; import java.util.List; -import electrosphere.data.creature.ai.AITreeData; -import electrosphere.data.creature.ai.AttackerTreeData; -import electrosphere.data.creature.ai.BlockerTreeData; -import electrosphere.data.creature.ai.StandardCharacterTreeData; +import electrosphere.data.entity.creature.ai.AITreeData; +import electrosphere.data.entity.creature.ai.AttackerTreeData; +import electrosphere.data.entity.creature.ai.BlockerTreeData; +import electrosphere.data.entity.creature.ai.StandardCharacterTreeData; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; diff --git a/src/main/java/electrosphere/server/ai/AIManager.java b/src/main/java/electrosphere/server/ai/AIManager.java index d9bfc2f6..d0a483e0 100644 --- a/src/main/java/electrosphere/server/ai/AIManager.java +++ b/src/main/java/electrosphere/server/ai/AIManager.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Random; import java.util.concurrent.locks.ReentrantLock; -import electrosphere.data.creature.ai.AITreeData; +import electrosphere.data.entity.creature.ai.AITreeData; import electrosphere.entity.Entity; import electrosphere.logger.LoggerInterface; import electrosphere.server.ai.services.NearbyEntityService; diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java index 65ecb6ec..f4753716 100644 --- a/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java @@ -2,7 +2,7 @@ package electrosphere.server.ai.nodes.actions.combat; import org.joml.Vector3d; -import electrosphere.data.creature.ai.AttackerTreeData; +import electrosphere.data.entity.creature.ai.AttackerTreeData; import electrosphere.entity.Entity; import electrosphere.entity.EntityUtils; import electrosphere.server.ai.blackboard.Blackboard; diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java index 8f310aed..ed8c6b5b 100644 --- a/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java @@ -1,7 +1,7 @@ package electrosphere.server.ai.nodes.actions.interact; import electrosphere.data.crafting.RecipeData; -import electrosphere.data.item.source.ItemSourcingData; +import electrosphere.data.entity.item.source.ItemSourcingData; import electrosphere.entity.Entity; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java b/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java index 9c1d7d1e..ff222cd9 100644 --- a/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java @@ -4,8 +4,8 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import electrosphere.data.item.source.ItemSourcingData; -import electrosphere.data.item.source.ItemSourcingData.SourcingType; +import electrosphere.data.entity.item.source.ItemSourcingData; +import electrosphere.data.entity.item.source.ItemSourcingData.SourcingType; import electrosphere.entity.Entity; import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.server.ai.blackboard.Blackboard; diff --git a/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java b/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java index 3fe01c86..7f530df6 100644 --- a/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java @@ -1,7 +1,7 @@ package electrosphere.server.ai.nodes.plan; -import electrosphere.data.item.source.ItemSourcingData; -import electrosphere.data.item.source.ItemSourcingTree; +import electrosphere.data.entity.item.source.ItemSourcingData; +import electrosphere.data.entity.item.source.ItemSourcingTree; import electrosphere.entity.Entity; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.blackboard.BlackboardKeys; diff --git a/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java b/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java index b6e7784f..ed35907d 100644 --- a/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java @@ -6,7 +6,7 @@ import org.joml.Vector3i; import electrosphere.client.block.BlockChunkData; import electrosphere.data.block.BlockType; import electrosphere.data.block.fab.BlockFab; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.server.ai.blackboard.Blackboard; diff --git a/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java b/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java index bb43e744..656a7679 100644 --- a/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java +++ b/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.character; -import electrosphere.data.creature.ai.StandardCharacterTreeData; +import electrosphere.data.entity.creature.ai.StandardCharacterTreeData; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.meta.collections.SelectorNode; import electrosphere.server.ai.nodes.meta.collections.SequenceNode; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java b/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java index 8b1d3e65..831ce060 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.creature; -import electrosphere.data.creature.ai.AttackerTreeData; +import electrosphere.data.entity.creature.ai.AttackerTreeData; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.meta.collections.SequenceNode; import electrosphere.server.ai.trees.creature.melee.MeleeAITree; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java b/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java index 55bb45c1..256dab70 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.creature.melee; -import electrosphere.data.creature.ai.AttackerTreeData; +import electrosphere.data.entity.creature.ai.AttackerTreeData; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java b/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java index dc9c5df7..5e3a453a 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java @@ -1,7 +1,7 @@ package electrosphere.server.ai.trees.creature.resource; import electrosphere.collision.CollisionEngine; -import electrosphere.data.item.source.ItemSourcingData.SourcingType; +import electrosphere.data.entity.item.source.ItemSourcingData.SourcingType; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.actions.interact.CollectItemNode; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java b/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java index 41af6168..5d9fcb20 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.creature.resource; -import electrosphere.data.item.ItemIdStrings; +import electrosphere.data.entity.item.ItemIdStrings; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.AITreeNode.AITreeNodeResult; diff --git a/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java b/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java index de278774..f9c0500f 100644 --- a/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.test; -import electrosphere.data.creature.ai.BlockerTreeData; +import electrosphere.data.entity.creature.ai.BlockerTreeData; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.actions.BlockStartNode; diff --git a/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java b/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java index f8af4a66..0296f7d0 100644 --- a/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java +++ b/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java @@ -12,8 +12,8 @@ import org.joml.Quaterniond; import org.joml.Vector3d; import org.joml.Vector4d; -import electrosphere.data.common.treedata.TreeDataAnimation; -import electrosphere.data.creature.bonegroups.BoneGroup; +import electrosphere.data.entity.common.treedata.TreeDataAnimation; +import electrosphere.data.entity.creature.bonegroups.BoneGroup; import electrosphere.engine.Globals; import electrosphere.entity.state.AnimationPriorities; import electrosphere.logger.LoggerInterface; diff --git a/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java b/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java index b042a1b2..bed2be54 100644 --- a/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java +++ b/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java @@ -6,7 +6,7 @@ import org.joml.Vector3i; import electrosphere.client.block.BlockChunkData; import electrosphere.data.block.BlockType; import electrosphere.data.block.fab.BlockFab; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerWorldData; diff --git a/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java index af7a4c07..7033d551 100644 --- a/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java +++ b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java @@ -7,7 +7,7 @@ import java.util.Map.Entry; import org.joml.Vector3d; import org.joml.Vector3i; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; diff --git a/src/main/java/electrosphere/server/player/BlockActions.java b/src/main/java/electrosphere/server/player/BlockActions.java index 47125b2b..978ee43e 100644 --- a/src/main/java/electrosphere/server/player/BlockActions.java +++ b/src/main/java/electrosphere/server/player/BlockActions.java @@ -3,7 +3,7 @@ package electrosphere.server.player; import org.joml.Vector3i; import electrosphere.data.block.BlockType; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.equip.ServerToolbarState; diff --git a/src/main/java/electrosphere/server/player/CraftingActions.java b/src/main/java/electrosphere/server/player/CraftingActions.java index 0e4bde25..81e875da 100644 --- a/src/main/java/electrosphere/server/player/CraftingActions.java +++ b/src/main/java/electrosphere/server/player/CraftingActions.java @@ -7,8 +7,8 @@ import java.util.Map; import electrosphere.data.crafting.RecipeData; import electrosphere.data.crafting.RecipeIngredientData; -import electrosphere.data.item.Item; -import electrosphere.data.item.ItemDataMap; +import electrosphere.data.entity.item.Item; +import electrosphere.data.entity.item.ItemDataMap; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; diff --git a/src/main/java/electrosphere/server/player/PlayerActions.java b/src/main/java/electrosphere/server/player/PlayerActions.java index bf56ae45..319ca2af 100644 --- a/src/main/java/electrosphere/server/player/PlayerActions.java +++ b/src/main/java/electrosphere/server/player/PlayerActions.java @@ -4,11 +4,11 @@ import org.joml.Vector3d; import org.joml.Vector3i; import electrosphere.client.interact.ItemActions; -import electrosphere.data.common.interact.InteractionData; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.block.BlockVariant; -import electrosphere.data.item.Item; -import electrosphere.data.item.ItemUsage; +import electrosphere.data.entity.common.interact.InteractionData; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.block.BlockVariant; +import electrosphere.data.entity.item.Item; +import electrosphere.data.entity.item.ItemUsage; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.block.ServerBlockTree; diff --git a/src/main/java/electrosphere/util/FileUtils.java b/src/main/java/electrosphere/util/FileUtils.java index 684fc2f7..d7992607 100644 --- a/src/main/java/electrosphere/util/FileUtils.java +++ b/src/main/java/electrosphere/util/FileUtils.java @@ -3,10 +3,10 @@ package electrosphere.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import electrosphere.data.creature.ai.AITreeData; -import electrosphere.data.creature.ai.AITreeDataSerializer; -import electrosphere.data.creature.movement.MovementSystem; -import electrosphere.data.creature.movement.MovementSystemSerializer; +import electrosphere.data.entity.creature.ai.AITreeData; +import electrosphere.data.entity.creature.ai.AITreeDataSerializer; +import electrosphere.data.entity.creature.movement.MovementSystem; +import electrosphere.data.entity.creature.movement.MovementSystemSerializer; import electrosphere.logger.LoggerInterface; import electrosphere.server.macro.character.data.CharacterData; import electrosphere.server.macro.character.data.CharacterDataSerializer; diff --git a/src/main/java/electrosphere/util/SerializationUtils.java b/src/main/java/electrosphere/util/SerializationUtils.java index be255278..b857688c 100644 --- a/src/main/java/electrosphere/util/SerializationUtils.java +++ b/src/main/java/electrosphere/util/SerializationUtils.java @@ -3,10 +3,10 @@ package electrosphere.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import electrosphere.data.creature.ai.AITreeData; -import electrosphere.data.creature.ai.AITreeDataSerializer; -import electrosphere.data.creature.movement.MovementSystem; -import electrosphere.data.creature.movement.MovementSystemSerializer; +import electrosphere.data.entity.creature.ai.AITreeData; +import electrosphere.data.entity.creature.ai.AITreeDataSerializer; +import electrosphere.data.entity.creature.movement.MovementSystem; +import electrosphere.data.entity.creature.movement.MovementSystemSerializer; import electrosphere.server.macro.character.data.CharacterData; import electrosphere.server.macro.character.data.CharacterDataSerializer; import electrosphere.server.physics.terrain.generation.noise.NoiseModuleSerializer; diff --git a/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java b/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java index 0c14b7f2..e76c5381 100644 --- a/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java +++ b/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java @@ -5,14 +5,14 @@ import static org.junit.jupiter.api.Assertions.*; import org.joml.Vector3d; import org.junit.jupiter.api.Disabled; -import electrosphere.data.common.CommonEntityMap; -import electrosphere.data.common.CommonEntityType; -import electrosphere.data.creature.CreatureData; -import electrosphere.data.creature.CreatureTypeLoader; -import electrosphere.data.foliage.FoliageType; -import electrosphere.data.foliage.FoliageTypeLoader; -import electrosphere.data.item.Item; -import electrosphere.data.item.ItemDataMap; +import electrosphere.data.entity.common.CommonEntityMap; +import electrosphere.data.entity.common.CommonEntityType; +import electrosphere.data.entity.creature.CreatureData; +import electrosphere.data.entity.creature.CreatureTypeLoader; +import electrosphere.data.entity.foliage.FoliageType; +import electrosphere.data.entity.foliage.FoliageTypeLoader; +import electrosphere.data.entity.item.Item; +import electrosphere.data.entity.item.ItemDataMap; import electrosphere.engine.EngineState; import electrosphere.engine.Globals; import electrosphere.entity.types.EntityTypes.EntityType; diff --git a/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java b/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java index 61b0a641..34f1f209 100644 --- a/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java +++ b/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java @@ -8,7 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; import electrosphere.collision.PhysicsEntityUtils; -import electrosphere.data.item.Item; +import electrosphere.data.entity.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityTags;