moving data classes around

src/main/java/electrosphere/audio/collision/HitboxAudioService.java

@@ -5,11 +5,11 @@ import java.util.Random;
 import org.joml.Vector3d;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
+import electrosphere.data.collidable.HitboxData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.collidable.HitboxData;
 import electrosphere.logger.LoggerInterface;
 
 /**

src/main/java/electrosphere/audio/movement/MovementAudioService.java

@@ -9,9 +9,9 @@ import org.joml.Vector3d;
 
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.terrain.sampling.ClientVoxelSampler;
+import electrosphere.data.audio.SurfaceAudioCollection;
+import electrosphere.data.audio.SurfaceAudioType;
 import electrosphere.engine.Globals;
-import electrosphere.game.data.audio.SurfaceAudioCollection;
-import electrosphere.game.data.audio.SurfaceAudioType;
 import electrosphere.logger.LoggerInterface;
 
 /**

src/main/java/electrosphere/client/block/ClientBlockSelection.java

@@ -6,8 +6,8 @@ import org.joml.Vector3d;
 import org.joml.Vector3i;
 
 import electrosphere.client.interact.select.AreaSelection;
+import electrosphere.data.block.BlockFab;
 import electrosphere.engine.Globals;
-import electrosphere.game.data.block.BlockFab;
 
 /**
  * Class for selecting blocks on the client

src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java

@@ -2,11 +2,11 @@ package electrosphere.client.collision;
 
 import org.joml.Vector3d;
 
+import electrosphere.data.collidable.HitboxData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.collidable.HitboxData;
 import electrosphere.logger.LoggerInterface;
 
 /**

src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java

@@ -1,5 +1,6 @@
 package electrosphere.client.entity.camera;
 
+import electrosphere.data.common.CommonEntityType;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
@@ -7,7 +8,6 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.btree.BehaviorTree;
 import electrosphere.entity.types.common.CommonEntityUtils;
-import electrosphere.game.data.common.CommonEntityType;
 import electrosphere.util.math.SpatialMathUtils;
 
 import org.joml.Matrix4d;

src/main/java/electrosphere/client/entity/particle/ParticleService.java

@@ -8,6 +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.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.signal.Signal;
 import electrosphere.engine.signal.Signal.SignalType;
@@ -17,7 +18,6 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.client.particle.ClientParticleTree;
-import electrosphere.game.data.particle.ParticleData;
 import electrosphere.renderer.actor.instance.StridedInstanceData;
 import electrosphere.renderer.buffer.HomogenousUniformBuffer.HomogenousBufferTypes;
 import electrosphere.renderer.texture.TextureAtlas;

src/main/java/electrosphere/client/entity/particle/ParticleUtils.java

@@ -1,5 +1,6 @@
 package electrosphere.client.entity.particle;
 
+import electrosphere.data.particle.ParticleData;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.DrawableUtils;
@@ -9,7 +10,6 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.client.particle.ClientParticleTree;
-import electrosphere.game.data.particle.ParticleData;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorTextureMask;
 

src/main/java/electrosphere/client/interact/ButtonInteraction.java

@@ -6,13 +6,13 @@ import electrosphere.client.entity.camera.CameraEntityUtils;
 import electrosphere.client.entity.crosshair.Crosshair;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.client.ui.menu.dialog.DialogMenuGenerator;
+import electrosphere.data.common.interact.InteractionData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.equip.ClientEquipState;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.types.common.CommonEntityFlags;
 import electrosphere.entity.types.common.CommonEntityUtils;
-import electrosphere.game.data.common.interact.InteractionData;
 import electrosphere.net.parser.net.message.EntityMessage;
 
 /**

src/main/java/electrosphere/client/interact/ClientInteractionEngine.java

@@ -18,13 +18,13 @@ import electrosphere.collision.CollisionBodyCreation;
 import electrosphere.collision.CollisionEngine;
 import electrosphere.collision.PhysicsUtils;
 import electrosphere.collision.collidable.Collidable;
+import electrosphere.data.collidable.CollidableTemplate;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.EntityTypes.EntityType;
 import electrosphere.entity.types.common.CommonEntityUtils;
-import electrosphere.game.data.collidable.CollidableTemplate;
 import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 
 /**

src/main/java/electrosphere/client/interact/ItemActions.java

@@ -7,6 +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.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.Entity;
@@ -14,7 +15,6 @@ import electrosphere.entity.state.attack.ClientAttackTree;
 import electrosphere.entity.state.attack.ShooterTree;
 import electrosphere.entity.state.equip.ClientToolbarState;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.data.item.Item;
 import electrosphere.net.parser.net.message.InventoryMessage;
 
 /**

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

@@ -2,7 +2,7 @@ package electrosphere.client.scene;
 
 import org.joml.Vector3d;
 
-import electrosphere.game.data.block.BlockFab;
+import electrosphere.data.block.BlockFab;
 
 /**
  * Stores the data for the client's level edits

src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java

@@ -9,9 +9,9 @@ import org.joml.Vector3d;
 import org.joml.Vector3i;
 
 import electrosphere.client.terrain.cache.ChunkData;
+import electrosphere.data.foliage.FoliageType;
 import electrosphere.engine.Globals;
 import electrosphere.entity.EntityUtils;
-import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;
 import electrosphere.util.ds.octree.WorldOctTree;

src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java

@@ -13,6 +13,7 @@ import org.joml.Vector3i;
 import org.lwjgl.BufferUtils;
 
 import electrosphere.client.terrain.cache.ChunkData;
+import electrosphere.data.foliage.FoliageType;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.queue.QueuedTexture;
 import electrosphere.engine.assetmanager.queue.QueuedTexture.QueuedTextureType;
@@ -26,7 +27,6 @@ import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.foliage.AmbientFoliage;
 import electrosphere.entity.types.EntityTypes.EntityType;
 import electrosphere.entity.types.common.CommonEntityUtils;
-import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.actor.instance.TextureInstancedActor;
 import electrosphere.server.physics.terrain.manager.ServerTerrainChunk;

src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java

@@ -8,12 +8,12 @@ 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.engine.Globals;
 import electrosphere.entity.types.EntityTypes.EntityType;
 import electrosphere.entity.types.creature.ObjectTemplate;
-import electrosphere.game.data.creature.type.CreatureData;
-import electrosphere.game.data.creature.type.visualattribute.AttributeVariant;
-import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorStaticMorph;
 import electrosphere.renderer.actor.ActorUtils;

src/main/java/electrosphere/client/ui/components/CraftingPanel.java

@@ -3,10 +3,10 @@ package electrosphere.client.ui.components;
 import java.util.function.Consumer;
 
 import electrosphere.client.ui.menu.WindowStrings;
+import electrosphere.data.crafting.RecipeData;
+import electrosphere.data.crafting.RecipeIngredientData;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
-import electrosphere.game.data.crafting.RecipeData;
-import electrosphere.game.data.crafting.RecipeIngredientData;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java

@@ -5,6 +5,8 @@ import java.util.List;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.data.creature.equip.EquipPoint;
+import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.signal.Signal.SignalType;
@@ -14,8 +16,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.game.data.item.Item;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;

src/main/java/electrosphere/client/ui/components/ItemIconPanel.java

@@ -3,6 +3,7 @@ package electrosphere.client.ui.components;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.signal.Signal.SignalType;
@@ -11,7 +12,6 @@ import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.state.item.ClientChargeState;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.item.Item;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java

@@ -3,6 +3,7 @@ package electrosphere.client.ui.components;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.Entity;
@@ -11,7 +12,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.item.Item;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java

@@ -4,8 +4,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.function.Consumer;
 
+import electrosphere.data.common.CommonEntityType;
 import electrosphere.engine.Globals;
-import electrosphere.game.data.common.CommonEntityType;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java

@@ -5,6 +5,7 @@ import org.joml.Vector4f;
 import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.Entity;
@@ -14,7 +15,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.item.Item;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Label;

src/main/java/electrosphere/client/ui/components/VoxelSelectionPanel.java

@@ -7,9 +7,9 @@ import org.joml.Vector4f;
 
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.YogaUtils;
+import electrosphere.data.voxel.VoxelData;
+import electrosphere.data.voxel.VoxelType;
 import electrosphere.engine.Globals;
-import electrosphere.game.data.voxel.VoxelData;
-import electrosphere.game.data.voxel.VoxelType;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.ImagePanel;

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityActorTab.java

@@ -3,13 +3,13 @@ package electrosphere.client.ui.menu.debug.entity;
 import java.util.Set;
 import java.util.Random;
 
+import electrosphere.data.common.CommonEntityType;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.AnimationPriorities;
 import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.tree.ProceduralTree;
-import electrosphere.game.data.common.CommonEntityType;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorAnimationMask;

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityFoliageTab.java

@@ -1,12 +1,12 @@
 package electrosphere.client.ui.menu.debug.entity;
 
 import electrosphere.client.terrain.foliage.FoliageModel;
+import electrosphere.data.foliage.FoliageType;
+import electrosphere.data.foliage.GrassData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.types.common.CommonEntityUtils;
-import electrosphere.game.data.foliage.type.FoliageType;
-import electrosphere.game.data.foliage.type.GrassData;
 import electrosphere.renderer.actor.instance.TextureInstancedActor;
 import imgui.ImGui;
 

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityHitboxTab.java

@@ -6,10 +6,10 @@ import java.util.List;
 import org.ode4j.ode.DGeom;
 import org.ode4j.ode.DSphere;
 
+import electrosphere.data.collidable.HitboxData;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.hitbox.HitboxCollectionState;
 import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState;
-import electrosphere.game.data.collidable.HitboxData;
 import imgui.ImGui;
 
 /**

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityInstancedActorTab.java

@@ -2,15 +2,15 @@ package electrosphere.client.ui.menu.debug.entity;
 
 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.entity.ClientEntityUtils;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.attach.AttachUtils;
 import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.tree.ProceduralTree;
-import electrosphere.game.data.common.CommonEntityType;
-import electrosphere.game.data.foliage.type.ProceduralTreeBranchModel;
-import electrosphere.game.data.foliage.type.TreeModel;
-import electrosphere.game.data.graphics.ProceduralModel;
 import electrosphere.renderer.actor.instance.InstancedActor;
 import imgui.ImGui;
 

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java

@@ -10,6 +10,8 @@ import org.ode4j.ode.DBody;
 
 import electrosphere.client.entity.debug.DebugVisualizerUtils;
 import electrosphere.collision.PhysicsEntityUtils;
+import electrosphere.data.creature.equip.EquipPoint;
+import electrosphere.data.foliage.FoliageType;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
@@ -27,8 +29,6 @@ import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.foliage.FoliageUtils;
 import electrosphere.entity.types.item.ItemUtils;
 import electrosphere.entity.types.terrain.TerrainChunk;
-import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.game.data.foliage.type.FoliageType;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.actor.ActorAnimationMask;
 import electrosphere.renderer.actor.instance.InstancedActor;

src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityPhysicsTab.java

@@ -7,12 +7,12 @@ import org.ode4j.ode.DGeom;
 import org.ode4j.ode.DMass;
 
 import electrosphere.collision.PhysicsEntityUtils;
+import electrosphere.data.collidable.CollidableTemplate;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.data.collidable.CollidableTemplate;
 import electrosphere.server.datacell.utils.EntityLookupUtils;
 import imgui.ImGui;
 

src/main/java/electrosphere/client/ui/menu/editor/ImGuiStructureTab.java

@@ -6,9 +6,9 @@ import org.joml.Vector3d;
 
 import electrosphere.client.block.ClientBlockSelection;
 import electrosphere.client.interact.select.AreaSelection;
+import electrosphere.data.block.BlockFab;
+import electrosphere.data.block.BlockFabMetadata;
 import electrosphere.engine.Globals;
-import electrosphere.game.data.block.BlockFab;
-import electrosphere.game.data.block.BlockFabMetadata;
 import imgui.ImGui;
 
 /**

src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java

@@ -5,10 +5,10 @@ import electrosphere.client.ui.components.CraftingPanel;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
+import electrosphere.data.crafting.RecipeData;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.signal.Signal.SignalType;
-import electrosphere.game.data.crafting.RecipeData;
 import electrosphere.net.parser.net.message.InventoryMessage;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment;

src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java

@@ -6,9 +6,9 @@ import electrosphere.client.ui.components.FabSelectionPanel;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
+import electrosphere.data.block.BlockFab;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
-import electrosphere.game.data.block.BlockFab;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaFlexDirection;

src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java

@@ -5,6 +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.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.engine.signal.Signal.SignalType;
@@ -12,8 +14,6 @@ import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.data.creature.type.CreatureData;
-import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
 import electrosphere.renderer.RenderingEngine;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorStaticMorph;

src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java

@@ -4,11 +4,11 @@ import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType;
 import electrosphere.client.ui.components.PlayerInventoryWindow;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.item.Item;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.Window;

src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java

@@ -7,6 +7,11 @@ 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.units.UnitDefinition;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.Entity;
@@ -15,11 +20,6 @@ import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.foliage.FoliageUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.common.CommonEntityType;
-import electrosphere.game.data.creature.type.CreatureData;
-import electrosphere.game.data.foliage.type.FoliageType;
-import electrosphere.game.data.item.Item;
-import electrosphere.game.data.units.UnitDefinition;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.renderer.light.DirectionalLight;
 import electrosphere.renderer.light.LightManager;

src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java

@@ -5,10 +5,10 @@ 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.voxel.VoxelType;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
-import electrosphere.game.data.common.CommonEntityType;
-import electrosphere.game.data.voxel.VoxelType;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaAlignment;
 import electrosphere.renderer.ui.elementtypes.ContainerElement.YogaFlexDirection;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java

@@ -7,13 +7,13 @@ import electrosphere.client.ui.components.InputMacros;
 import electrosphere.client.ui.components.VoxelSelectionPanel;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
+import electrosphere.data.voxel.VoxelType;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.loadingthreads.LoadingThread;
 import electrosphere.engine.loadingthreads.LoadingThread.LoadingThreadType;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.scene.SceneFile;
-import electrosphere.game.data.voxel.VoxelType;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Div;
 import electrosphere.renderer.ui.elements.FormElement;

src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java

@@ -16,6 +16,10 @@ 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.voxel.VoxelType;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.entity.Entity;
@@ -24,10 +28,6 @@ import electrosphere.entity.state.inventory.InventoryUtils;
 import electrosphere.entity.state.inventory.RelationalInventoryState;
 import electrosphere.entity.state.inventory.UnrelationalInventoryState;
 import electrosphere.entity.types.creature.ObjectTemplate;
-import electrosphere.game.data.common.CommonEntityType;
-import electrosphere.game.data.crafting.RecipeData;
-import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.game.data.voxel.VoxelType;
 import electrosphere.renderer.actor.ActorUtils;
 import electrosphere.renderer.ui.elements.ActorPanel;
 import electrosphere.renderer.ui.elements.Button;

src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java

@@ -6,15 +6,15 @@ 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.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.types.common.CommonEntityUtils;
 import electrosphere.entity.types.creature.CreatureUtils;
 import electrosphere.entity.types.foliage.FoliageUtils;
 import electrosphere.entity.types.item.ItemUtils;
-import electrosphere.game.data.creature.type.CreatureData;
-import electrosphere.game.data.foliage.type.FoliageType;
-import electrosphere.game.data.item.Item;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.server.datacell.Realm;
 

src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java

@@ -5,8 +5,8 @@ import org.graalvm.polyglot.HostAccess.Export;
 import electrosphere.client.ui.menu.WindowStrings;
 import electrosphere.client.ui.menu.WindowUtils;
 import electrosphere.controls.ControlHandler.ControlsState;
+import electrosphere.data.tutorial.TutorialHint;
 import electrosphere.engine.Globals;
-import electrosphere.game.data.tutorial.TutorialHint;
 import electrosphere.renderer.ui.elements.Button;
 import electrosphere.renderer.ui.elements.Label;
 import electrosphere.renderer.ui.elements.TextBox;

src/main/java/electrosphere/collision/CollisionEngine.java

@@ -36,6 +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.engine.Globals;
 import electrosphere.engine.time.Timekeeper;
 import electrosphere.entity.Entity;
@@ -43,8 +45,6 @@ import electrosphere.entity.EntityDataStrings;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.collidable.Impulse;
 import electrosphere.entity.state.physicssync.ServerPhysicsSyncTree;
-import electrosphere.game.data.collidable.CollidableTemplate;
-import electrosphere.game.data.collidable.HitboxData;
 import electrosphere.logger.LoggerInterface;
 
 /**

src/main/java/electrosphere/collision/PhysicsEntityUtils.java

@@ -10,6 +10,7 @@ import org.ode4j.ode.DBody;
 import org.ode4j.ode.DGeom;
 
 import electrosphere.collision.collidable.Collidable;
+import electrosphere.data.collidable.CollidableTemplate;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
@@ -22,7 +23,6 @@ import electrosphere.entity.state.collidable.ServerCollidableTree;
 import electrosphere.entity.state.collidable.TriGeomData;
 import electrosphere.entity.state.physicssync.ClientPhysicsSyncTree;
 import electrosphere.entity.state.physicssync.ServerPhysicsSyncTree;
-import electrosphere.game.data.collidable.CollidableTemplate;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.datacell.utils.ServerEntityTagUtils;

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.game.data.collidable.CollidableTemplate;
+import electrosphere.data.collidable.CollidableTemplate;
 
 /**
  * Utilities for leveraging the collision system to perform physics

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

@@ -1,8 +1,8 @@
 package electrosphere.collision.hitbox;
 
+import electrosphere.data.collidable.HitboxData;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityDataStrings;
-import electrosphere.game.data.collidable.HitboxData;
 
 import org.joml.Vector3d;
 

src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java

@@ -23,6 +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.engine.Globals;
 import electrosphere.engine.Main;
 import electrosphere.engine.assetmanager.AssetDataStrings;
@@ -41,7 +42,6 @@ import electrosphere.entity.state.movement.jump.ClientJumpTree;
 import electrosphere.entity.state.movement.sprint.ClientSprintTree;
 import electrosphere.entity.state.movement.walk.ClientWalkTree;
 import electrosphere.entity.types.creature.CreatureUtils;
-import electrosphere.game.data.item.Item;
 import electrosphere.renderer.ui.elements.Window;
 import electrosphere.renderer.ui.events.MouseEvent;
 import electrosphere.renderer.ui.events.ScrollEvent;

src/main/java/electrosphere/controls/cursor/CursorState.java

@@ -9,6 +9,8 @@ import electrosphere.client.block.BlockChunkData;
 import electrosphere.client.entity.camera.CameraEntityUtils;
 import electrosphere.client.interact.select.AreaSelection;
 import electrosphere.collision.CollisionEngine;
+import electrosphere.data.block.BlockFab;
+import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.engine.assetmanager.AssetDataStrings;
 import electrosphere.engine.assetmanager.queue.QueuedModel;
@@ -18,8 +20,6 @@ import electrosphere.entity.EntityCreationUtils;
 import electrosphere.entity.EntityTags;
 import electrosphere.entity.EntityUtils;
 import electrosphere.entity.state.equip.ClientToolbarState;
-import electrosphere.game.data.block.BlockFab;
-import electrosphere.game.data.item.Item;
 import electrosphere.renderer.actor.Actor;
 import electrosphere.renderer.actor.ActorTextureMask;
 import electrosphere.renderer.meshgen.BlockMeshgen;

src/main/java/electrosphere/data/Config.java

@@ -1,31 +1,31 @@
-package electrosphere.game.data;
+package electrosphere.data;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import electrosphere.game.data.audio.SurfaceAudioCollection;
-import electrosphere.game.data.biome.BiomeTypeMap;
-import electrosphere.game.data.block.BlockData;
-import electrosphere.game.data.common.CommonEntityLoader;
-import electrosphere.game.data.common.CommonEntityMap;
-import electrosphere.game.data.common.CommonEntityType;
-import electrosphere.game.data.crafting.RecipeDataMap;
-import electrosphere.game.data.creature.type.CreatureData;
-import electrosphere.game.data.creature.type.CreatureTypeLoader;
-import electrosphere.game.data.creature.type.attack.AttackMoveResolver;
-import electrosphere.game.data.creature.type.model.CreatureTypeMap;
-import electrosphere.game.data.foliage.type.FoliageType;
-import electrosphere.game.data.foliage.type.FoliageTypeLoader;
-import electrosphere.game.data.foliage.type.model.FoliageTypeMap;
-import electrosphere.game.data.item.ItemDataMap;
-import electrosphere.game.data.item.source.ItemSourcingMap;
-import electrosphere.game.data.projectile.ProjectileTypeHolder;
-import electrosphere.game.data.struct.StructureDataLoader;
-import electrosphere.game.data.tutorial.HintDefinition;
-import electrosphere.game.data.units.UnitDefinitionFile;
-import electrosphere.game.data.units.UnitLoader;
-import electrosphere.game.data.voxel.VoxelData;
-import electrosphere.game.data.voxel.sampler.SamplerFile;
+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.struct.StructureDataLoader;
+import electrosphere.data.tutorial.HintDefinition;
+import electrosphere.data.units.UnitDefinitionFile;
+import electrosphere.data.units.UnitLoader;
+import electrosphere.data.voxel.VoxelData;
+import electrosphere.data.voxel.sampler.SamplerFile;
 import electrosphere.server.macro.race.RaceMap;
 import electrosphere.server.macro.symbolism.SymbolMap;
 import electrosphere.util.FileUtils;

src/main/java/electrosphere/data/ConfigValidator.java

@@ -1,8 +1,8 @@
-package electrosphere.game.data;
+package electrosphere.data;
 
-import electrosphere.game.data.creature.type.CreatureData;
-import electrosphere.game.data.creature.type.CreatureDataValidator;
-import electrosphere.game.data.creature.type.CreatureTypeLoader;
+import electrosphere.data.creature.CreatureData;
+import electrosphere.data.creature.CreatureDataValidator;
+import electrosphere.data.creature.CreatureTypeLoader;
 
 /**
  * Used to validate the config

src/main/java/electrosphere/data/audio/SurfaceAudioCollection.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.audio;
+package electrosphere.data.audio;
 
 import java.util.List;
 

src/main/java/electrosphere/data/audio/SurfaceAudioType.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.audio;
+package electrosphere.data.audio;
 
 import java.util.List;
 

src/main/java/electrosphere/data/biome/BiomeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import java.util.List;
 

src/main/java/electrosphere/data/biome/BiomeDataFile.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import java.util.List;
 

src/main/java/electrosphere/data/biome/BiomeFloorElement.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import electrosphere.util.noise.NoiseMapperElement;
 

src/main/java/electrosphere/data/biome/BiomeFoliageDescription.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import java.util.List;
 

src/main/java/electrosphere/data/biome/BiomeRegion.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import java.util.List;
 

src/main/java/electrosphere/data/biome/BiomeSurfaceGenerationParams.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import java.util.List;
 

src/main/java/electrosphere/data/biome/BiomeTypeMap.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.biome;
+package electrosphere.data.biome;
 
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/electrosphere/data/block/BlockData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.block;
+package electrosphere.data.block;
 
 import java.util.Set;
 

src/main/java/electrosphere/data/block/BlockFab.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.block;
+package electrosphere.data.block;
 
 import java.io.File;
 import java.io.IOException;

src/main/java/electrosphere/data/block/BlockFabMetadata.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.block;
+package electrosphere.data.block;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/data/block/BlockType.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.block;
+package electrosphere.data.block;
 
 /**
  * Data about a particular type of block

src/main/java/electrosphere/data/collidable/CollidableTemplate.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.collidable;
+package electrosphere.data.collidable;
 
 /**
  * A template for a rigid body that should be attached to an entity

src/main/java/electrosphere/data/collidable/HitboxData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.collidable;
+package electrosphere.data.collidable;
 
 import java.util.List;
 

src/main/java/electrosphere/data/color/ColorRange.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.color;
+package electrosphere.data.color;
 
 /**
  * Defines a range of colors

src/main/java/electrosphere/data/common/CommonEntityLoader.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common;
+package electrosphere.data.common;
 
 import java.util.List;
 

src/main/java/electrosphere/data/common/CommonEntityMap.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common;
+package electrosphere.data.common;
 
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/electrosphere/data/common/CommonEntityTokens.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common;
+package electrosphere.data.common;
 
 /**
  * All common entity tokens

src/main/java/electrosphere/data/common/CommonEntityType.java

@@ -1,31 +1,31 @@
-package electrosphere.game.data.common;
+package electrosphere.data.common;
 
 import java.util.List;
 
-import electrosphere.game.data.collidable.CollidableTemplate;
-import electrosphere.game.data.collidable.HitboxData;
-import electrosphere.game.data.common.camera.CameraData;
-import electrosphere.game.data.common.interact.InteractionData;
-import electrosphere.game.data.common.item.SpawnItemDescription;
-import electrosphere.game.data.common.life.HealthSystem;
-import electrosphere.game.data.common.light.PointLightDescription;
-import electrosphere.game.data.creature.type.LookAtSystem;
-import electrosphere.game.data.creature.type.ViewModelData;
-import electrosphere.game.data.creature.type.ai.AITreeData;
-import electrosphere.game.data.creature.type.attack.AttackMove;
-import electrosphere.game.data.creature.type.attack.AttackMoveResolver;
-import electrosphere.game.data.creature.type.block.BlockSystem;
-import electrosphere.game.data.creature.type.bonegroups.BoneGroup;
-import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.game.data.creature.type.equip.ToolbarData;
-import electrosphere.game.data.creature.type.movement.MovementSystem;
-import electrosphere.game.data.creature.type.rotator.RotatorSystem;
-import electrosphere.game.data.foliage.type.AmbientAudio;
-import electrosphere.game.data.foliage.type.GrowthModel;
-import electrosphere.game.data.furniture.FurnitureData;
-import electrosphere.game.data.graphics.GraphicsTemplate;
-import electrosphere.game.data.grident.GridAlignedData;
-import electrosphere.game.data.particle.ParticleEmitter;
+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.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.GrowthModel;
+import electrosphere.data.furniture.FurnitureData;
+import electrosphere.data.graphics.GraphicsTemplate;
+import electrosphere.data.grident.GridAlignedData;
+import electrosphere.data.particle.ParticleEmitter;
 
 /**
  * Common data that all entity types use

src/main/java/electrosphere/data/common/camera/CameraData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.camera;
+package electrosphere.data.common.camera;
 
 import org.joml.Vector3d;
 

src/main/java/electrosphere/data/common/interact/InteractionData.java

@@ -1,6 +1,6 @@
-package electrosphere.game.data.common.interact;
+package electrosphere.data.common.interact;
 
-import electrosphere.game.data.collidable.CollidableTemplate;
+import electrosphere.data.collidable.CollidableTemplate;
 
 /**
  * Controls handling when interacting with this entity

src/main/java/electrosphere/data/common/item/SpawnItemDescription.java

@@ -1,6 +1,6 @@
-package electrosphere.game.data.common.item;
+package electrosphere.data.common.item;
 
-import electrosphere.game.data.graphics.GraphicsTemplate;
+import electrosphere.data.graphics.GraphicsTemplate;
 
 /**
  * Describes an automatically generated item definition for an item that can spawn this object

src/main/java/electrosphere/data/common/life/HealthSystem.java

@@ -1,7 +1,7 @@
-package electrosphere.game.data.common.life;
+package electrosphere.data.common.life;
 
-import electrosphere.game.data.common.life.loot.LootPool;
-import electrosphere.game.data.common.treedata.TreeDataState;
+import electrosphere.data.common.life.loot.LootPool;
+import electrosphere.data.common.treedata.TreeDataState;
 
 /**
  * Data about the health of a creature

src/main/java/electrosphere/data/common/life/loot/LootPool.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.life.loot;
+package electrosphere.data.common.life.loot;
 
 import java.util.List;
 

src/main/java/electrosphere/data/common/life/loot/LootTicket.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.life.loot;
+package electrosphere.data.common.life.loot;
 
 /**
  * A ticket that can be selected when dropping from the loot pool

src/main/java/electrosphere/data/common/light/PointLightDescription.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.light;
+package electrosphere.data.common.light;
 
 import org.joml.Vector3d;
 import org.joml.Vector3f;

src/main/java/electrosphere/data/common/treedata/TreeDataAnimation.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.treedata;
+package electrosphere.data.common.treedata;
 
 import java.util.List;
 

src/main/java/electrosphere/data/common/treedata/TreeDataAudio.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.treedata;
+package electrosphere.data.common.treedata;
 
 /**
  * Audio data to use when running a given tree state

src/main/java/electrosphere/data/common/treedata/TreeDataState.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.common.treedata;
+package electrosphere.data.common.treedata;
 
 /**
  * A simple tree state

src/main/java/electrosphere/data/crafting/RecipeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.crafting;
+package electrosphere.data.crafting;
 
 import java.util.List;
 

src/main/java/electrosphere/data/crafting/RecipeDataFile.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.crafting;
+package electrosphere.data.crafting;
 
 import java.util.List;
 

src/main/java/electrosphere/data/crafting/RecipeDataMap.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.crafting;
+package electrosphere.data.crafting;
 
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/electrosphere/data/crafting/RecipeIngredientData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.crafting;
+package electrosphere.data.crafting;
 
 /**
  * An ingredient in a recipe

src/main/java/electrosphere/data/creature/CreatureData.java

@@ -1,10 +1,10 @@
-package electrosphere.game.data.creature.type;
-
-import electrosphere.game.data.common.CommonEntityType;
-import electrosphere.game.data.creature.type.visualattribute.VisualAttribute;
+package electrosphere.data.creature;
 
 import java.util.List;
 
+import electrosphere.data.common.CommonEntityType;
+import electrosphere.data.creature.visualattribute.VisualAttribute;
+
 /**
  * A given type of creature
  */

src/main/java/electrosphere/data/creature/CreatureDataValidator.java

@@ -1,16 +1,16 @@
-package electrosphere.game.data.creature.type;
+package electrosphere.data.creature;
 
 import java.util.LinkedList;
 import java.util.List;
 
-import electrosphere.game.data.common.treedata.TreeDataAnimation;
-import electrosphere.game.data.creature.type.attack.AttackMove;
-import electrosphere.game.data.creature.type.bonegroups.BoneGroup;
-import electrosphere.game.data.creature.type.equip.EquipPoint;
-import electrosphere.game.data.creature.type.movement.FallMovementSystem;
-import electrosphere.game.data.creature.type.movement.GroundMovementSystem;
-import electrosphere.game.data.creature.type.movement.JumpMovementSystem;
-import electrosphere.game.data.creature.type.movement.MovementSystem;
+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.logger.LoggerInterface;
 
 /**

src/main/java/electrosphere/data/creature/CreatureTypeLoader.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type;
+package electrosphere.data.creature;
 
 import java.util.Collection;
 import java.util.HashMap;

src/main/java/electrosphere/data/creature/CreatureTypeMap.java

@@ -1,6 +1,5 @@
-package electrosphere.game.data.creature.type.model;
+package electrosphere.data.creature;
 
-import electrosphere.game.data.creature.type.CreatureData;
 import java.util.List;
 
 public class CreatureTypeMap {

src/main/java/electrosphere/data/creature/IdleData.java

@@ -1,6 +1,6 @@
-package electrosphere.game.data.creature.type;
+package electrosphere.data.creature;
 
-import electrosphere.game.data.common.treedata.TreeDataAnimation;
+import electrosphere.data.common.treedata.TreeDataAnimation;
 
 /**
  * Data about how the creature will behave when in idle state

src/main/java/electrosphere/data/creature/LookAtSystem.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type;
+package electrosphere.data.creature;
 
 /**
  * Look at behavior and data

src/main/java/electrosphere/data/creature/SprintSystem.java

@@ -1,6 +1,6 @@
-package electrosphere.game.data.creature.type;
+package electrosphere.data.creature;
 
-import electrosphere.game.data.common.treedata.TreeDataAnimation;
+import electrosphere.data.common.treedata.TreeDataAnimation;
 
 /**
  * Sprint data

src/main/java/electrosphere/data/creature/ViewModelData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type;
+package electrosphere.data.creature;
 
 /**
  * Data about the first person view model for this creature type

src/main/java/electrosphere/data/creature/ai/AITreeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.ai;
+package electrosphere.data.creature.ai;
 
 /**
  * Configuration data for an ai tree

src/main/java/electrosphere/data/creature/ai/AITreeDataSerializer.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.ai;
+package electrosphere.data.creature.ai;
 
 import java.lang.reflect.Type;
 

src/main/java/electrosphere/data/creature/ai/AttackerTreeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.ai;
+package electrosphere.data.creature.ai;
 
 import electrosphere.server.ai.trees.creature.AttackerAITree;
 

src/main/java/electrosphere/data/creature/ai/BlockerTreeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.ai;
+package electrosphere.data.creature.ai;
 
 import electrosphere.server.ai.trees.test.BlockerAITree;
 

src/main/java/electrosphere/data/creature/ai/MaslowTreeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.ai;
+package electrosphere.data.creature.ai;
 
 import electrosphere.server.ai.trees.hierarchy.MaslowTree;
 

src/main/java/electrosphere/data/creature/ai/StandardCharacterTreeData.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.ai;
+package electrosphere.data.creature.ai;
 
 import electrosphere.server.ai.trees.character.StandardCharacterTree;
 

src/main/java/electrosphere/data/creature/attack/AttackMove.java

@@ -1,8 +1,8 @@
-package electrosphere.game.data.creature.type.attack;
+package electrosphere.data.creature.attack;
 
 import java.util.List;
 
-import electrosphere.game.data.common.treedata.TreeDataState;
+import electrosphere.data.common.treedata.TreeDataState;
 
 /**
  * Data about a single attack move this creature is capable of

src/main/java/electrosphere/data/creature/attack/AttackMoveResolver.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.attack;
+package electrosphere.data.creature.attack;
 
 import java.util.HashMap;
 import java.util.LinkedList;

src/main/java/electrosphere/data/creature/block/BlockSystem.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.block;
+package electrosphere.data.creature.block;
 
 import java.util.List;
 

src/main/java/electrosphere/data/creature/block/BlockVariant.java

@@ -1,9 +1,9 @@
-package electrosphere.game.data.creature.type.block;
+package electrosphere.data.creature.block;
 
 import java.util.List;
 
-import electrosphere.game.data.common.treedata.TreeDataAnimation;
-import electrosphere.game.data.common.treedata.TreeDataAudio;
+import electrosphere.data.common.treedata.TreeDataAnimation;
+import electrosphere.data.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/creature/block/VariantDefaults.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.block;
+package electrosphere.data.creature.block;
 
 /**
  * Equip point cases that this variant is used as the default for

src/main/java/electrosphere/data/creature/bonegroups/BoneGroup.java

@@ -1,4 +1,4 @@
-package electrosphere.game.data.creature.type.bonegroups;
+package electrosphere.data.creature.bonegroups;
 
 import java.util.List;