shuffle data packages

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
 
 
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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;
 

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;

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;

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;

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;
 
 /**

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

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

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;
 

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;
 

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;

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

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

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;
 
 /**

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;
 

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

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

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

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

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;
 

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

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;

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;
 

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

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

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

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;
 
 /**

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;

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;
 

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

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

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

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

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

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;
 

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;
 

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;
 

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;
 

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;
 

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

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;

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;
 

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.

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

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;
 

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

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

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 {
 

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

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

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

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

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 {
     

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;
 

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

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 {
     

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;
 

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;
 

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;
 

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;
 

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

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

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;

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;
 

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;
 

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