diff --git a/src/main/java/electrosphere/audio/collision/HitboxAudioService.java b/src/main/java/electrosphere/audio/collision/HitboxAudioService.java index e11612e9..707891b6 100644 --- a/src/main/java/electrosphere/audio/collision/HitboxAudioService.java +++ b/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; /** diff --git a/src/main/java/electrosphere/audio/movement/MovementAudioService.java b/src/main/java/electrosphere/audio/movement/MovementAudioService.java index 7442ba71..b84c0523 100644 --- a/src/main/java/electrosphere/audio/movement/MovementAudioService.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/block/ClientBlockSelection.java b/src/main/java/electrosphere/client/block/ClientBlockSelection.java index 8e662d92..c0f79fb5 100644 --- a/src/main/java/electrosphere/client/block/ClientBlockSelection.java +++ b/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 diff --git a/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java b/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java index 220706d3..41b274b4 100644 --- a/src/main/java/electrosphere/client/collision/ClientNetworkHitboxCollision.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java b/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java index c125e873..b9177318 100644 --- a/src/main/java/electrosphere/client/entity/camera/CameraEntityUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/client/entity/particle/ParticleService.java b/src/main/java/electrosphere/client/entity/particle/ParticleService.java index dbb15775..5095945c 100644 --- a/src/main/java/electrosphere/client/entity/particle/ParticleService.java +++ b/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; diff --git a/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java b/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java index 139eec42..0c53f4dd 100644 --- a/src/main/java/electrosphere/client/entity/particle/ParticleUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/client/interact/ButtonInteraction.java b/src/main/java/electrosphere/client/interact/ButtonInteraction.java index 8e533a11..8874c8af 100644 --- a/src/main/java/electrosphere/client/interact/ButtonInteraction.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java b/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java index b405b6c8..a11b4b41 100644 --- a/src/main/java/electrosphere/client/interact/ClientInteractionEngine.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/interact/ItemActions.java b/src/main/java/electrosphere/client/interact/ItemActions.java index ba63761e..1a50baa8 100644 --- a/src/main/java/electrosphere/client/interact/ItemActions.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/scene/ClientLevelEditorData.java b/src/main/java/electrosphere/client/scene/ClientLevelEditorData.java index 71f3604c..a6a4d129 100644 --- a/src/main/java/electrosphere/client/scene/ClientLevelEditorData.java +++ b/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 diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java index 8349edf6..31d023ce 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageCellManager.java +++ b/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; diff --git a/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java b/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java index f2700dbc..3af8fb1b 100644 --- a/src/main/java/electrosphere/client/terrain/foliage/FoliageModel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java b/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java index 6fb33a68..3ae2d92d 100644 --- a/src/main/java/electrosphere/client/ui/components/CharacterCustomizer.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/CraftingPanel.java b/src/main/java/electrosphere/client/ui/components/CraftingPanel.java index 9b99d861..69c97ca2 100644 --- a/src/main/java/electrosphere/client/ui/components/CraftingPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java index e3b3fa95..a5fd3bb2 100644 --- a/src/main/java/electrosphere/client/ui/components/EquipmentInventoryPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java b/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java index 640f84d5..72902dfa 100644 --- a/src/main/java/electrosphere/client/ui/components/ItemIconPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java index 4ff7bd96..262049d9 100644 --- a/src/main/java/electrosphere/client/ui/components/NaturalInventoryPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java b/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java index 021a4146..1903da8f 100644 --- a/src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java b/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java index d2188885..36d7794a 100644 --- a/src/main/java/electrosphere/client/ui/components/ToolbarInventoryPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/components/VoxelSelectionPanel.java b/src/main/java/electrosphere/client/ui/components/VoxelSelectionPanel.java index 28b09a18..feabe12a 100644 --- a/src/main/java/electrosphere/client/ui/components/VoxelSelectionPanel.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityActorTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityActorTab.java index 3bc29fed..83825d54 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityActorTab.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityFoliageTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityFoliageTab.java index 52de1958..2b6579f3 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityFoliageTab.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityHitboxTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityHitboxTab.java index 3b3bbd59..0efb5a3b 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityHitboxTab.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityInstancedActorTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityInstancedActorTab.java index 291ebe45..95283a52 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityInstancedActorTab.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java index 434db8ad..bab493ee 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java +++ b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityMacros.java @@ -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; diff --git a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityPhysicsTab.java b/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityPhysicsTab.java index 40d29a7c..4102953c 100644 --- a/src/main/java/electrosphere/client/ui/menu/debug/entity/ImGuiEntityPhysicsTab.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/editor/ImGuiStructureTab.java b/src/main/java/electrosphere/client/ui/menu/editor/ImGuiStructureTab.java index cf8572dd..53e02c53 100644 --- a/src/main/java/electrosphere/client/ui/menu/editor/ImGuiStructureTab.java +++ b/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; /** diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java b/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java index d8b2c33c..602c8d5d 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/CraftingWindow.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java b/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java index ab11d40e..5a3c76d2 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/FabMenus.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java index a525edcf..1527b2cc 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInGame.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java index 4bfc0624..c917e633 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsInventory.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java index eeff7efb..8e83b46d 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsLevelEditor.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java b/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java index 0b0d74e4..296a5936 100644 --- a/src/main/java/electrosphere/client/ui/menu/ingame/MenuGeneratorsTerrainEditing.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java index d6855ce1..2aac5e0f 100644 --- a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsLevelEditor.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java b/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java index 17778bf9..c1aa6db5 100644 --- a/src/main/java/electrosphere/client/ui/menu/mainmenu/MenuGeneratorsUITesting.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java b/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java index e643456b..164e4656 100644 --- a/src/main/java/electrosphere/client/ui/menu/script/ScriptLevelEditorUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java b/src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java index 1889575e..d2e350f4 100644 --- a/src/main/java/electrosphere/client/ui/menu/tutorial/TutorialMenus.java +++ b/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; diff --git a/src/main/java/electrosphere/collision/CollisionEngine.java b/src/main/java/electrosphere/collision/CollisionEngine.java index ad21f3a6..681f76fa 100644 --- a/src/main/java/electrosphere/collision/CollisionEngine.java +++ b/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; /** diff --git a/src/main/java/electrosphere/collision/PhysicsEntityUtils.java b/src/main/java/electrosphere/collision/PhysicsEntityUtils.java index 553868e9..1cd17664 100644 --- a/src/main/java/electrosphere/collision/PhysicsEntityUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/collision/PhysicsUtils.java b/src/main/java/electrosphere/collision/PhysicsUtils.java index 27b1ca4f..64d0eeda 100644 --- a/src/main/java/electrosphere/collision/PhysicsUtils.java +++ b/src/main/java/electrosphere/collision/PhysicsUtils.java @@ -9,7 +9,7 @@ import org.ode4j.math.DQuaternionC; import org.ode4j.ode.DBody; import electrosphere.collision.collidable.Collidable; -import electrosphere.game.data.collidable.CollidableTemplate; +import electrosphere.data.collidable.CollidableTemplate; /** * Utilities for leveraging the collision system to perform physics diff --git a/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java b/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java index 6988cbfe..038b9420 100644 --- a/src/main/java/electrosphere/collision/hitbox/HitboxUtils.java +++ b/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; diff --git a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java b/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java index ac3a8eeb..ad3f1e32 100644 --- a/src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java +++ b/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; diff --git a/src/main/java/electrosphere/controls/cursor/CursorState.java b/src/main/java/electrosphere/controls/cursor/CursorState.java index e08d5863..89071780 100644 --- a/src/main/java/electrosphere/controls/cursor/CursorState.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/Config.java b/src/main/java/electrosphere/data/Config.java similarity index 89% rename from src/main/java/electrosphere/game/data/Config.java rename to src/main/java/electrosphere/data/Config.java index 59f6c34a..8d4d5353 100644 --- a/src/main/java/electrosphere/game/data/Config.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/ConfigValidator.java b/src/main/java/electrosphere/data/ConfigValidator.java similarity index 67% rename from src/main/java/electrosphere/game/data/ConfigValidator.java rename to src/main/java/electrosphere/data/ConfigValidator.java index 581cbdc1..ade4e2c5 100644 --- a/src/main/java/electrosphere/game/data/ConfigValidator.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/audio/SurfaceAudioCollection.java b/src/main/java/electrosphere/data/audio/SurfaceAudioCollection.java similarity index 96% rename from src/main/java/electrosphere/game/data/audio/SurfaceAudioCollection.java rename to src/main/java/electrosphere/data/audio/SurfaceAudioCollection.java index 9420d95f..9f9d86d8 100644 --- a/src/main/java/electrosphere/game/data/audio/SurfaceAudioCollection.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/audio/SurfaceAudioType.java b/src/main/java/electrosphere/data/audio/SurfaceAudioType.java similarity index 98% rename from src/main/java/electrosphere/game/data/audio/SurfaceAudioType.java rename to src/main/java/electrosphere/data/audio/SurfaceAudioType.java index aac71376..1aba6f21 100644 --- a/src/main/java/electrosphere/game/data/audio/SurfaceAudioType.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeData.java b/src/main/java/electrosphere/data/biome/BiomeData.java similarity index 98% rename from src/main/java/electrosphere/game/data/biome/BiomeData.java rename to src/main/java/electrosphere/data/biome/BiomeData.java index 2bafe980..8494628d 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeDataFile.java b/src/main/java/electrosphere/data/biome/BiomeDataFile.java similarity index 96% rename from src/main/java/electrosphere/game/data/biome/BiomeDataFile.java rename to src/main/java/electrosphere/data/biome/BiomeDataFile.java index 9c3db840..9e1f4e12 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeDataFile.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeFloorElement.java b/src/main/java/electrosphere/data/biome/BiomeFloorElement.java similarity index 95% rename from src/main/java/electrosphere/game/data/biome/BiomeFloorElement.java rename to src/main/java/electrosphere/data/biome/BiomeFloorElement.java index 59cc8c7d..0a2d1201 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeFloorElement.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeFoliageDescription.java b/src/main/java/electrosphere/data/biome/BiomeFoliageDescription.java similarity index 97% rename from src/main/java/electrosphere/game/data/biome/BiomeFoliageDescription.java rename to src/main/java/electrosphere/data/biome/BiomeFoliageDescription.java index 779ba782..1004af7b 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeFoliageDescription.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeRegion.java b/src/main/java/electrosphere/data/biome/BiomeRegion.java similarity index 96% rename from src/main/java/electrosphere/game/data/biome/BiomeRegion.java rename to src/main/java/electrosphere/data/biome/BiomeRegion.java index 0ef2b982..44837416 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeRegion.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeSurfaceGenerationParams.java b/src/main/java/electrosphere/data/biome/BiomeSurfaceGenerationParams.java similarity index 98% rename from src/main/java/electrosphere/game/data/biome/BiomeSurfaceGenerationParams.java rename to src/main/java/electrosphere/data/biome/BiomeSurfaceGenerationParams.java index 626fe4dd..a08506c5 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeSurfaceGenerationParams.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/biome/BiomeTypeMap.java b/src/main/java/electrosphere/data/biome/BiomeTypeMap.java similarity index 99% rename from src/main/java/electrosphere/game/data/biome/BiomeTypeMap.java rename to src/main/java/electrosphere/data/biome/BiomeTypeMap.java index 8cf15e04..bc0f0b8a 100644 --- a/src/main/java/electrosphere/game/data/biome/BiomeTypeMap.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/block/BlockData.java b/src/main/java/electrosphere/data/block/BlockData.java similarity index 96% rename from src/main/java/electrosphere/game/data/block/BlockData.java rename to src/main/java/electrosphere/data/block/BlockData.java index 41705cf2..8cdce675 100644 --- a/src/main/java/electrosphere/game/data/block/BlockData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/block/BlockFab.java b/src/main/java/electrosphere/data/block/BlockFab.java similarity index 99% rename from src/main/java/electrosphere/game/data/block/BlockFab.java rename to src/main/java/electrosphere/data/block/BlockFab.java index 9f80874a..93106415 100644 --- a/src/main/java/electrosphere/game/data/block/BlockFab.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/block/BlockFabMetadata.java b/src/main/java/electrosphere/data/block/BlockFabMetadata.java similarity index 95% rename from src/main/java/electrosphere/game/data/block/BlockFabMetadata.java rename to src/main/java/electrosphere/data/block/BlockFabMetadata.java index 1b6865dd..78335d61 100644 --- a/src/main/java/electrosphere/game/data/block/BlockFabMetadata.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/block/BlockType.java b/src/main/java/electrosphere/data/block/BlockType.java similarity index 96% rename from src/main/java/electrosphere/game/data/block/BlockType.java rename to src/main/java/electrosphere/data/block/BlockType.java index 8a64adc3..c1e25e26 100644 --- a/src/main/java/electrosphere/game/data/block/BlockType.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/collidable/CollidableTemplate.java b/src/main/java/electrosphere/data/collidable/CollidableTemplate.java similarity index 99% rename from src/main/java/electrosphere/game/data/collidable/CollidableTemplate.java rename to src/main/java/electrosphere/data/collidable/CollidableTemplate.java index d3841d7c..778527b5 100644 --- a/src/main/java/electrosphere/game/data/collidable/CollidableTemplate.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/collidable/HitboxData.java b/src/main/java/electrosphere/data/collidable/HitboxData.java similarity index 99% rename from src/main/java/electrosphere/game/data/collidable/HitboxData.java rename to src/main/java/electrosphere/data/collidable/HitboxData.java index f3c6b53c..bae7bc02 100644 --- a/src/main/java/electrosphere/game/data/collidable/HitboxData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/color/ColorRange.java b/src/main/java/electrosphere/data/color/ColorRange.java similarity index 97% rename from src/main/java/electrosphere/game/data/color/ColorRange.java rename to src/main/java/electrosphere/data/color/ColorRange.java index bb41c3c8..fa6d8ae2 100644 --- a/src/main/java/electrosphere/game/data/color/ColorRange.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/CommonEntityLoader.java b/src/main/java/electrosphere/data/common/CommonEntityLoader.java similarity index 94% rename from src/main/java/electrosphere/game/data/common/CommonEntityLoader.java rename to src/main/java/electrosphere/data/common/CommonEntityLoader.java index 5759bb38..8a47f083 100644 --- a/src/main/java/electrosphere/game/data/common/CommonEntityLoader.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/common/CommonEntityMap.java b/src/main/java/electrosphere/data/common/CommonEntityMap.java similarity index 96% rename from src/main/java/electrosphere/game/data/common/CommonEntityMap.java rename to src/main/java/electrosphere/data/common/CommonEntityMap.java index 286ada35..783ede64 100644 --- a/src/main/java/electrosphere/game/data/common/CommonEntityMap.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/common/CommonEntityTokens.java b/src/main/java/electrosphere/data/common/CommonEntityTokens.java similarity index 90% rename from src/main/java/electrosphere/game/data/common/CommonEntityTokens.java rename to src/main/java/electrosphere/data/common/CommonEntityTokens.java index 58d1c79b..fecd3d97 100644 --- a/src/main/java/electrosphere/game/data/common/CommonEntityTokens.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/CommonEntityType.java b/src/main/java/electrosphere/data/common/CommonEntityType.java similarity index 85% rename from src/main/java/electrosphere/game/data/common/CommonEntityType.java rename to src/main/java/electrosphere/data/common/CommonEntityType.java index 59b05fca..ab9ab5a5 100644 --- a/src/main/java/electrosphere/game/data/common/CommonEntityType.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/camera/CameraData.java b/src/main/java/electrosphere/data/common/camera/CameraData.java similarity index 94% rename from src/main/java/electrosphere/game/data/common/camera/CameraData.java rename to src/main/java/electrosphere/data/common/camera/CameraData.java index 0e073d14..766a4c12 100644 --- a/src/main/java/electrosphere/game/data/common/camera/CameraData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/common/interact/InteractionData.java b/src/main/java/electrosphere/data/common/interact/InteractionData.java similarity index 94% rename from src/main/java/electrosphere/game/data/common/interact/InteractionData.java rename to src/main/java/electrosphere/data/common/interact/InteractionData.java index ff298e28..36ffb7a3 100644 --- a/src/main/java/electrosphere/game/data/common/interact/InteractionData.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/item/SpawnItemDescription.java b/src/main/java/electrosphere/data/common/item/SpawnItemDescription.java similarity index 86% rename from src/main/java/electrosphere/game/data/common/item/SpawnItemDescription.java rename to src/main/java/electrosphere/data/common/item/SpawnItemDescription.java index 2b35a9d3..23a34a5c 100644 --- a/src/main/java/electrosphere/game/data/common/item/SpawnItemDescription.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/life/HealthSystem.java b/src/main/java/electrosphere/data/common/life/HealthSystem.java similarity index 87% rename from src/main/java/electrosphere/game/data/common/life/HealthSystem.java rename to src/main/java/electrosphere/data/common/life/HealthSystem.java index e23a9dc9..35e6095f 100644 --- a/src/main/java/electrosphere/game/data/common/life/HealthSystem.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/life/loot/LootPool.java b/src/main/java/electrosphere/data/common/life/loot/LootPool.java similarity index 92% rename from src/main/java/electrosphere/game/data/common/life/loot/LootPool.java rename to src/main/java/electrosphere/data/common/life/loot/LootPool.java index d5e85c53..95d0e2e3 100644 --- a/src/main/java/electrosphere/game/data/common/life/loot/LootPool.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/common/life/loot/LootTicket.java b/src/main/java/electrosphere/data/common/life/loot/LootTicket.java similarity index 97% rename from src/main/java/electrosphere/game/data/common/life/loot/LootTicket.java rename to src/main/java/electrosphere/data/common/life/loot/LootTicket.java index aa0ac8c2..263d778e 100644 --- a/src/main/java/electrosphere/game/data/common/life/loot/LootTicket.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/light/PointLightDescription.java b/src/main/java/electrosphere/data/common/light/PointLightDescription.java similarity index 98% rename from src/main/java/electrosphere/game/data/common/light/PointLightDescription.java rename to src/main/java/electrosphere/data/common/light/PointLightDescription.java index 1f476693..ca459f76 100644 --- a/src/main/java/electrosphere/game/data/common/light/PointLightDescription.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/common/treedata/TreeDataAnimation.java b/src/main/java/electrosphere/data/common/treedata/TreeDataAnimation.java similarity index 97% rename from src/main/java/electrosphere/game/data/common/treedata/TreeDataAnimation.java rename to src/main/java/electrosphere/data/common/treedata/TreeDataAnimation.java index fffed553..54b738f1 100644 --- a/src/main/java/electrosphere/game/data/common/treedata/TreeDataAnimation.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/common/treedata/TreeDataAudio.java b/src/main/java/electrosphere/data/common/treedata/TreeDataAudio.java similarity index 86% rename from src/main/java/electrosphere/game/data/common/treedata/TreeDataAudio.java rename to src/main/java/electrosphere/data/common/treedata/TreeDataAudio.java index 904719c3..dbaeacf9 100644 --- a/src/main/java/electrosphere/game/data/common/treedata/TreeDataAudio.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/common/treedata/TreeDataState.java b/src/main/java/electrosphere/data/common/treedata/TreeDataState.java similarity index 92% rename from src/main/java/electrosphere/game/data/common/treedata/TreeDataState.java rename to src/main/java/electrosphere/data/common/treedata/TreeDataState.java index 050588b3..22cb7505 100644 --- a/src/main/java/electrosphere/game/data/common/treedata/TreeDataState.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/crafting/RecipeData.java b/src/main/java/electrosphere/data/crafting/RecipeData.java similarity index 98% rename from src/main/java/electrosphere/game/data/crafting/RecipeData.java rename to src/main/java/electrosphere/data/crafting/RecipeData.java index 10d1df3d..945f6f1f 100644 --- a/src/main/java/electrosphere/game/data/crafting/RecipeData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/crafting/RecipeDataFile.java b/src/main/java/electrosphere/data/crafting/RecipeDataFile.java similarity index 95% rename from src/main/java/electrosphere/game/data/crafting/RecipeDataFile.java rename to src/main/java/electrosphere/data/crafting/RecipeDataFile.java index ad313f2b..e13371e0 100644 --- a/src/main/java/electrosphere/game/data/crafting/RecipeDataFile.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/crafting/RecipeDataMap.java b/src/main/java/electrosphere/data/crafting/RecipeDataMap.java similarity index 98% rename from src/main/java/electrosphere/game/data/crafting/RecipeDataMap.java rename to src/main/java/electrosphere/data/crafting/RecipeDataMap.java index 57b9527e..fc7e09c6 100644 --- a/src/main/java/electrosphere/game/data/crafting/RecipeDataMap.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/crafting/RecipeIngredientData.java b/src/main/java/electrosphere/data/crafting/RecipeIngredientData.java similarity index 96% rename from src/main/java/electrosphere/game/data/crafting/RecipeIngredientData.java rename to src/main/java/electrosphere/data/crafting/RecipeIngredientData.java index 8ec69049..73415d62 100644 --- a/src/main/java/electrosphere/game/data/crafting/RecipeIngredientData.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/CreatureData.java b/src/main/java/electrosphere/data/creature/CreatureData.java similarity index 73% rename from src/main/java/electrosphere/game/data/creature/type/CreatureData.java rename to src/main/java/electrosphere/data/creature/CreatureData.java index 560d7b9c..771d12a7 100644 --- a/src/main/java/electrosphere/game/data/creature/type/CreatureData.java +++ b/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 */ diff --git a/src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java b/src/main/java/electrosphere/data/creature/CreatureDataValidator.java similarity index 90% rename from src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java rename to src/main/java/electrosphere/data/creature/CreatureDataValidator.java index c2d47531..1f9917c2 100644 --- a/src/main/java/electrosphere/game/data/creature/type/CreatureDataValidator.java +++ b/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; /** diff --git a/src/main/java/electrosphere/game/data/creature/type/CreatureTypeLoader.java b/src/main/java/electrosphere/data/creature/CreatureTypeLoader.java similarity index 98% rename from src/main/java/electrosphere/game/data/creature/type/CreatureTypeLoader.java rename to src/main/java/electrosphere/data/creature/CreatureTypeLoader.java index 28f873dd..dbde7c58 100644 --- a/src/main/java/electrosphere/game/data/creature/type/CreatureTypeLoader.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/model/CreatureTypeMap.java b/src/main/java/electrosphere/data/creature/CreatureTypeMap.java similarity index 70% rename from src/main/java/electrosphere/game/data/creature/type/model/CreatureTypeMap.java rename to src/main/java/electrosphere/data/creature/CreatureTypeMap.java index 06a7184d..4ae3bf99 100644 --- a/src/main/java/electrosphere/game/data/creature/type/model/CreatureTypeMap.java +++ b/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 { diff --git a/src/main/java/electrosphere/game/data/creature/type/IdleData.java b/src/main/java/electrosphere/data/creature/IdleData.java similarity index 76% rename from src/main/java/electrosphere/game/data/creature/type/IdleData.java rename to src/main/java/electrosphere/data/creature/IdleData.java index ce74e2c1..a1f682c0 100644 --- a/src/main/java/electrosphere/game/data/creature/type/IdleData.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java b/src/main/java/electrosphere/data/creature/LookAtSystem.java similarity index 90% rename from src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java rename to src/main/java/electrosphere/data/creature/LookAtSystem.java index 3bbc9b14..d7d55a5d 100644 --- a/src/main/java/electrosphere/game/data/creature/type/LookAtSystem.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/SprintSystem.java b/src/main/java/electrosphere/data/creature/SprintSystem.java similarity index 93% rename from src/main/java/electrosphere/game/data/creature/type/SprintSystem.java rename to src/main/java/electrosphere/data/creature/SprintSystem.java index 11b74c95..e182b5a1 100644 --- a/src/main/java/electrosphere/game/data/creature/type/SprintSystem.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/ViewModelData.java b/src/main/java/electrosphere/data/creature/ViewModelData.java similarity index 95% rename from src/main/java/electrosphere/game/data/creature/type/ViewModelData.java rename to src/main/java/electrosphere/data/creature/ViewModelData.java index 164979dd..6560d1b7 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ViewModelData.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/ai/AITreeData.java b/src/main/java/electrosphere/data/creature/ai/AITreeData.java similarity index 76% rename from src/main/java/electrosphere/game/data/creature/type/ai/AITreeData.java rename to src/main/java/electrosphere/data/creature/ai/AITreeData.java index 13648168..4f3cd39b 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ai/AITreeData.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/ai/AITreeDataSerializer.java b/src/main/java/electrosphere/data/creature/ai/AITreeDataSerializer.java similarity index 97% rename from src/main/java/electrosphere/game/data/creature/type/ai/AITreeDataSerializer.java rename to src/main/java/electrosphere/data/creature/ai/AITreeDataSerializer.java index 761e77d4..656a02a5 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ai/AITreeDataSerializer.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/ai/AttackerTreeData.java b/src/main/java/electrosphere/data/creature/ai/AttackerTreeData.java similarity index 94% rename from src/main/java/electrosphere/game/data/creature/type/ai/AttackerTreeData.java rename to src/main/java/electrosphere/data/creature/ai/AttackerTreeData.java index 86887828..8c36a28d 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ai/AttackerTreeData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/ai/BlockerTreeData.java b/src/main/java/electrosphere/data/creature/ai/BlockerTreeData.java similarity index 83% rename from src/main/java/electrosphere/game/data/creature/type/ai/BlockerTreeData.java rename to src/main/java/electrosphere/data/creature/ai/BlockerTreeData.java index 7d296bf2..3dec8d24 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ai/BlockerTreeData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/ai/MaslowTreeData.java b/src/main/java/electrosphere/data/creature/ai/MaslowTreeData.java similarity index 86% rename from src/main/java/electrosphere/game/data/creature/type/ai/MaslowTreeData.java rename to src/main/java/electrosphere/data/creature/ai/MaslowTreeData.java index 0bae2137..b36bb300 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ai/MaslowTreeData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/ai/StandardCharacterTreeData.java b/src/main/java/electrosphere/data/creature/ai/StandardCharacterTreeData.java similarity index 87% rename from src/main/java/electrosphere/game/data/creature/type/ai/StandardCharacterTreeData.java rename to src/main/java/electrosphere/data/creature/ai/StandardCharacterTreeData.java index 0731035f..1d575514 100644 --- a/src/main/java/electrosphere/game/data/creature/type/ai/StandardCharacterTreeData.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java b/src/main/java/electrosphere/data/creature/attack/AttackMove.java similarity index 97% rename from src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java rename to src/main/java/electrosphere/data/creature/attack/AttackMove.java index 1217fd77..c954d23d 100644 --- a/src/main/java/electrosphere/game/data/creature/type/attack/AttackMove.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/attack/AttackMoveResolver.java b/src/main/java/electrosphere/data/creature/attack/AttackMoveResolver.java similarity index 98% rename from src/main/java/electrosphere/game/data/creature/type/attack/AttackMoveResolver.java rename to src/main/java/electrosphere/data/creature/attack/AttackMoveResolver.java index 31c85994..d20269ea 100644 --- a/src/main/java/electrosphere/game/data/creature/type/attack/AttackMoveResolver.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/block/BlockSystem.java b/src/main/java/electrosphere/data/creature/block/BlockSystem.java similarity index 97% rename from src/main/java/electrosphere/game/data/creature/type/block/BlockSystem.java rename to src/main/java/electrosphere/data/creature/block/BlockSystem.java index 9cf1f2a6..a03d248c 100644 --- a/src/main/java/electrosphere/game/data/creature/type/block/BlockSystem.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/block/BlockVariant.java b/src/main/java/electrosphere/data/creature/block/BlockVariant.java similarity index 92% rename from src/main/java/electrosphere/game/data/creature/type/block/BlockVariant.java rename to src/main/java/electrosphere/data/creature/block/BlockVariant.java index 903cded9..96093630 100644 --- a/src/main/java/electrosphere/game/data/creature/type/block/BlockVariant.java +++ b/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. diff --git a/src/main/java/electrosphere/game/data/creature/type/block/VariantDefaults.java b/src/main/java/electrosphere/data/creature/block/VariantDefaults.java similarity index 93% rename from src/main/java/electrosphere/game/data/creature/type/block/VariantDefaults.java rename to src/main/java/electrosphere/data/creature/block/VariantDefaults.java index ced619ed..8b38bf51 100644 --- a/src/main/java/electrosphere/game/data/creature/type/block/VariantDefaults.java +++ b/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 diff --git a/src/main/java/electrosphere/game/data/creature/type/bonegroups/BoneGroup.java b/src/main/java/electrosphere/data/creature/bonegroups/BoneGroup.java similarity index 95% rename from src/main/java/electrosphere/game/data/creature/type/bonegroups/BoneGroup.java rename to src/main/java/electrosphere/data/creature/bonegroups/BoneGroup.java index 82f47a5b..c6e8328e 100644 --- a/src/main/java/electrosphere/game/data/creature/type/bonegroups/BoneGroup.java +++ b/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; diff --git a/src/main/java/electrosphere/game/data/creature/type/equip/EquipPoint.java b/src/main/java/electrosphere/data/creature/equip/EquipPoint.java similarity index 98% rename from src/main/java/electrosphere/game/data/creature/type/equip/EquipPoint.java rename to src/main/java/electrosphere/data/creature/equip/EquipPoint.java index 0272b868..d0195790 100644 --- a/src/main/java/electrosphere/game/data/creature/type/equip/EquipPoint.java +++ b/src/main/java/electrosphere/data/creature/equip/EquipPoint.java @@ -1,8 +1,8 @@ -package electrosphere.game.data.creature.type.equip; +package electrosphere.data.creature.equip; import java.util.List; -import electrosphere.game.data.common.treedata.TreeDataAnimation; +import electrosphere.data.common.treedata.TreeDataAnimation; /** * A portion of the creature that can have an item attached to it diff --git a/src/main/java/electrosphere/game/data/creature/type/equip/ToolbarData.java b/src/main/java/electrosphere/data/creature/equip/ToolbarData.java similarity index 92% rename from src/main/java/electrosphere/game/data/creature/type/equip/ToolbarData.java rename to src/main/java/electrosphere/data/creature/equip/ToolbarData.java index 64efc4c2..09623c0c 100644 --- a/src/main/java/electrosphere/game/data/creature/type/equip/ToolbarData.java +++ b/src/main/java/electrosphere/data/creature/equip/ToolbarData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.equip; +package electrosphere.data.creature.equip; /** * Data about the toolbar diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/AirplaneMovementSystem.java b/src/main/java/electrosphere/data/creature/movement/AirplaneMovementSystem.java similarity index 91% rename from src/main/java/electrosphere/game/data/creature/type/movement/AirplaneMovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/AirplaneMovementSystem.java index da34dd20..1a2e99b4 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/AirplaneMovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/AirplaneMovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; public class AirplaneMovementSystem implements MovementSystem { diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/EditorMovementSystem.java b/src/main/java/electrosphere/data/creature/movement/EditorMovementSystem.java similarity index 87% rename from src/main/java/electrosphere/game/data/creature/type/movement/EditorMovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/EditorMovementSystem.java index 57166852..32f07764 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/EditorMovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/EditorMovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; /** * Data about the editor movement system diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/FallMovementSystem.java b/src/main/java/electrosphere/data/creature/movement/FallMovementSystem.java similarity index 87% rename from src/main/java/electrosphere/game/data/creature/type/movement/FallMovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/FallMovementSystem.java index cd90ff81..8539b4c2 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/FallMovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/FallMovementSystem.java @@ -1,6 +1,6 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; -import electrosphere.game.data.common.treedata.TreeDataState; +import electrosphere.data.common.treedata.TreeDataState; /** * Data about a falling movement system diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/GroundMovementSystem.java b/src/main/java/electrosphere/data/creature/movement/GroundMovementSystem.java similarity index 94% rename from src/main/java/electrosphere/game/data/creature/type/movement/GroundMovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/GroundMovementSystem.java index dea7acf0..d48c0af0 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/GroundMovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/GroundMovementSystem.java @@ -1,7 +1,7 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.SprintSystem; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.SprintSystem; /** * A ground movement system's data diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/JumpMovementSystem.java b/src/main/java/electrosphere/data/creature/movement/JumpMovementSystem.java similarity index 89% rename from src/main/java/electrosphere/game/data/creature/type/movement/JumpMovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/JumpMovementSystem.java index 2a84baff..dfce5920 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/JumpMovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/JumpMovementSystem.java @@ -1,6 +1,6 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; -import electrosphere.game.data.common.treedata.TreeDataAnimation; +import electrosphere.data.common.treedata.TreeDataAnimation; /** * A jump tree's data diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/MovementSystem.java b/src/main/java/electrosphere/data/creature/movement/MovementSystem.java similarity index 56% rename from src/main/java/electrosphere/game/data/creature/type/movement/MovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/MovementSystem.java index 777193ef..95fa1628 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/MovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/MovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; public interface MovementSystem { diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/MovementSystemSerializer.java b/src/main/java/electrosphere/data/creature/movement/MovementSystemSerializer.java similarity index 96% rename from src/main/java/electrosphere/game/data/creature/type/movement/MovementSystemSerializer.java rename to src/main/java/electrosphere/data/creature/movement/MovementSystemSerializer.java index cd0ccb0d..824276f7 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/MovementSystemSerializer.java +++ b/src/main/java/electrosphere/data/creature/movement/MovementSystemSerializer.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; import java.lang.reflect.Type; diff --git a/src/main/java/electrosphere/game/data/creature/type/movement/WalkMovementSystem.java b/src/main/java/electrosphere/data/creature/movement/WalkMovementSystem.java similarity index 90% rename from src/main/java/electrosphere/game/data/creature/type/movement/WalkMovementSystem.java rename to src/main/java/electrosphere/data/creature/movement/WalkMovementSystem.java index a9e30611..4909f8dd 100644 --- a/src/main/java/electrosphere/game/data/creature/type/movement/WalkMovementSystem.java +++ b/src/main/java/electrosphere/data/creature/movement/WalkMovementSystem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.movement; +package electrosphere.data.creature.movement; /** * A walk movement system diff --git a/src/main/java/electrosphere/game/data/creature/type/rotator/RotatorConstraint.java b/src/main/java/electrosphere/data/creature/rotator/RotatorConstraint.java similarity index 90% rename from src/main/java/electrosphere/game/data/creature/type/rotator/RotatorConstraint.java rename to src/main/java/electrosphere/data/creature/rotator/RotatorConstraint.java index 9e0a3aa2..bd1faf91 100644 --- a/src/main/java/electrosphere/game/data/creature/type/rotator/RotatorConstraint.java +++ b/src/main/java/electrosphere/data/creature/rotator/RotatorConstraint.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.rotator; +package electrosphere.data.creature.rotator; public class RotatorConstraint { diff --git a/src/main/java/electrosphere/game/data/creature/type/rotator/RotatorItem.java b/src/main/java/electrosphere/data/creature/rotator/RotatorItem.java similarity index 83% rename from src/main/java/electrosphere/game/data/creature/type/rotator/RotatorItem.java rename to src/main/java/electrosphere/data/creature/rotator/RotatorItem.java index c0baf45a..28a2bac2 100644 --- a/src/main/java/electrosphere/game/data/creature/type/rotator/RotatorItem.java +++ b/src/main/java/electrosphere/data/creature/rotator/RotatorItem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.rotator; +package electrosphere.data.creature.rotator; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/creature/type/rotator/RotatorSystem.java b/src/main/java/electrosphere/data/creature/rotator/RotatorSystem.java similarity index 76% rename from src/main/java/electrosphere/game/data/creature/type/rotator/RotatorSystem.java rename to src/main/java/electrosphere/data/creature/rotator/RotatorSystem.java index 2fa978b6..cd84c08c 100644 --- a/src/main/java/electrosphere/game/data/creature/type/rotator/RotatorSystem.java +++ b/src/main/java/electrosphere/data/creature/rotator/RotatorSystem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.rotator; +package electrosphere.data.creature.rotator; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/creature/type/visualattribute/AttributeVariant.java b/src/main/java/electrosphere/data/creature/visualattribute/AttributeVariant.java similarity index 82% rename from src/main/java/electrosphere/game/data/creature/type/visualattribute/AttributeVariant.java rename to src/main/java/electrosphere/data/creature/visualattribute/AttributeVariant.java index 2ebcfad1..ce499660 100644 --- a/src/main/java/electrosphere/game/data/creature/type/visualattribute/AttributeVariant.java +++ b/src/main/java/electrosphere/data/creature/visualattribute/AttributeVariant.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.visualattribute; +package electrosphere.data.creature.visualattribute; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/creature/type/visualattribute/VisualAttribute.java b/src/main/java/electrosphere/data/creature/visualattribute/VisualAttribute.java similarity index 94% rename from src/main/java/electrosphere/game/data/creature/type/visualattribute/VisualAttribute.java rename to src/main/java/electrosphere/data/creature/visualattribute/VisualAttribute.java index 5d02d4ad..8312cc6b 100644 --- a/src/main/java/electrosphere/game/data/creature/type/visualattribute/VisualAttribute.java +++ b/src/main/java/electrosphere/data/creature/visualattribute/VisualAttribute.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.creature.type.visualattribute; +package electrosphere.data.creature.visualattribute; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/foliage/type/AmbientAudio.java b/src/main/java/electrosphere/data/foliage/AmbientAudio.java similarity index 97% rename from src/main/java/electrosphere/game/data/foliage/type/AmbientAudio.java rename to src/main/java/electrosphere/data/foliage/AmbientAudio.java index 98f4d017..d6660d83 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/AmbientAudio.java +++ b/src/main/java/electrosphere/data/foliage/AmbientAudio.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; /** * Parameters for ambient audio generation by this foliage diff --git a/src/main/java/electrosphere/game/data/foliage/type/FoliageType.java b/src/main/java/electrosphere/data/foliage/FoliageType.java similarity index 89% rename from src/main/java/electrosphere/game/data/foliage/type/FoliageType.java rename to src/main/java/electrosphere/data/foliage/FoliageType.java index 4dd523b6..5e17c0f2 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/FoliageType.java +++ b/src/main/java/electrosphere/data/foliage/FoliageType.java @@ -1,8 +1,8 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; import java.util.List; -import electrosphere.game.data.common.CommonEntityType; +import electrosphere.data.common.CommonEntityType; /** * A foliage object, ambient or otherwise diff --git a/src/main/java/electrosphere/game/data/foliage/type/FoliageTypeLoader.java b/src/main/java/electrosphere/data/foliage/FoliageTypeLoader.java similarity index 96% rename from src/main/java/electrosphere/game/data/foliage/type/FoliageTypeLoader.java rename to src/main/java/electrosphere/data/foliage/FoliageTypeLoader.java index 98d4b21f..9c4ff1d2 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/FoliageTypeLoader.java +++ b/src/main/java/electrosphere/data/foliage/FoliageTypeLoader.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/electrosphere/game/data/foliage/type/model/FoliageTypeMap.java b/src/main/java/electrosphere/data/foliage/FoliageTypeMap.java similarity index 90% rename from src/main/java/electrosphere/game/data/foliage/type/model/FoliageTypeMap.java rename to src/main/java/electrosphere/data/foliage/FoliageTypeMap.java index b501c175..e0639e7a 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/model/FoliageTypeMap.java +++ b/src/main/java/electrosphere/data/foliage/FoliageTypeMap.java @@ -1,6 +1,5 @@ -package electrosphere.game.data.foliage.type.model; +package electrosphere.data.foliage; -import electrosphere.game.data.foliage.type.FoliageType; import java.util.List; /** diff --git a/src/main/java/electrosphere/game/data/foliage/type/GrassData.java b/src/main/java/electrosphere/data/foliage/GrassData.java similarity index 97% rename from src/main/java/electrosphere/game/data/foliage/type/GrassData.java rename to src/main/java/electrosphere/data/foliage/GrassData.java index e8b872a0..6d032a0a 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/GrassData.java +++ b/src/main/java/electrosphere/data/foliage/GrassData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; import org.joml.Vector3f; diff --git a/src/main/java/electrosphere/game/data/foliage/type/GrowthModel.java b/src/main/java/electrosphere/data/foliage/GrowthModel.java similarity index 87% rename from src/main/java/electrosphere/game/data/foliage/type/GrowthModel.java rename to src/main/java/electrosphere/data/foliage/GrowthModel.java index 840074d2..c22bf29f 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/GrowthModel.java +++ b/src/main/java/electrosphere/data/foliage/GrowthModel.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; /** * Model of the growth characteristics of this piece of foliage diff --git a/src/main/java/electrosphere/game/data/foliage/type/PhysicsObject.java b/src/main/java/electrosphere/data/foliage/PhysicsObject.java similarity index 93% rename from src/main/java/electrosphere/game/data/foliage/type/PhysicsObject.java rename to src/main/java/electrosphere/data/foliage/PhysicsObject.java index 5bfb1123..df5a434d 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/PhysicsObject.java +++ b/src/main/java/electrosphere/data/foliage/PhysicsObject.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; /** * Physics data diff --git a/src/main/java/electrosphere/game/data/foliage/type/ProceduralTreeBranchModel.java b/src/main/java/electrosphere/data/foliage/ProceduralTreeBranchModel.java similarity index 98% rename from src/main/java/electrosphere/game/data/foliage/type/ProceduralTreeBranchModel.java rename to src/main/java/electrosphere/data/foliage/ProceduralTreeBranchModel.java index 0fcd0689..1dfae4ab 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/ProceduralTreeBranchModel.java +++ b/src/main/java/electrosphere/data/foliage/ProceduralTreeBranchModel.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; /** * Data for creating branches on a procedural tree diff --git a/src/main/java/electrosphere/game/data/foliage/type/ProceduralTreeTrunkModel.java b/src/main/java/electrosphere/data/foliage/ProceduralTreeTrunkModel.java similarity index 97% rename from src/main/java/electrosphere/game/data/foliage/type/ProceduralTreeTrunkModel.java rename to src/main/java/electrosphere/data/foliage/ProceduralTreeTrunkModel.java index c90a163f..16e259c0 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/ProceduralTreeTrunkModel.java +++ b/src/main/java/electrosphere/data/foliage/ProceduralTreeTrunkModel.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; /** * The data model for the trunk of the procedural tree diff --git a/src/main/java/electrosphere/game/data/foliage/type/TreeModel.java b/src/main/java/electrosphere/data/foliage/TreeModel.java similarity index 98% rename from src/main/java/electrosphere/game/data/foliage/type/TreeModel.java rename to src/main/java/electrosphere/data/foliage/TreeModel.java index 4dd4e9bb..96961be4 100644 --- a/src/main/java/electrosphere/game/data/foliage/type/TreeModel.java +++ b/src/main/java/electrosphere/data/foliage/TreeModel.java @@ -1,6 +1,6 @@ -package electrosphere.game.data.foliage.type; +package electrosphere.data.foliage; -import electrosphere.game.data.collidable.CollidableTemplate; +import electrosphere.data.collidable.CollidableTemplate; /** * Describes characteristics about a type of tree (how do the limbs dispere, where to the leaves start growing, how sturdy is it, etc) diff --git a/src/main/java/electrosphere/game/data/furniture/DoorData.java b/src/main/java/electrosphere/data/furniture/DoorData.java similarity index 92% rename from src/main/java/electrosphere/game/data/furniture/DoorData.java rename to src/main/java/electrosphere/data/furniture/DoorData.java index 4e93f9db..cf6a64a0 100644 --- a/src/main/java/electrosphere/game/data/furniture/DoorData.java +++ b/src/main/java/electrosphere/data/furniture/DoorData.java @@ -1,6 +1,6 @@ -package electrosphere.game.data.furniture; +package electrosphere.data.furniture; -import electrosphere.game.data.common.treedata.TreeDataState; +import electrosphere.data.common.treedata.TreeDataState; /** * Data about how a door functions diff --git a/src/main/java/electrosphere/game/data/furniture/FurnitureData.java b/src/main/java/electrosphere/data/furniture/FurnitureData.java similarity index 88% rename from src/main/java/electrosphere/game/data/furniture/FurnitureData.java rename to src/main/java/electrosphere/data/furniture/FurnitureData.java index ff53e55e..8c774849 100644 --- a/src/main/java/electrosphere/game/data/furniture/FurnitureData.java +++ b/src/main/java/electrosphere/data/furniture/FurnitureData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.furniture; +package electrosphere.data.furniture; /** * Data controlling furniture behavior diff --git a/src/main/java/electrosphere/game/data/graphics/GraphicsTemplate.java b/src/main/java/electrosphere/data/graphics/GraphicsTemplate.java similarity index 96% rename from src/main/java/electrosphere/game/data/graphics/GraphicsTemplate.java rename to src/main/java/electrosphere/data/graphics/GraphicsTemplate.java index b317b1d0..5fdb50a2 100644 --- a/src/main/java/electrosphere/game/data/graphics/GraphicsTemplate.java +++ b/src/main/java/electrosphere/data/graphics/GraphicsTemplate.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.graphics; +package electrosphere.data.graphics; /** * A graphics template for an entity diff --git a/src/main/java/electrosphere/game/data/graphics/NonproceduralModel.java b/src/main/java/electrosphere/data/graphics/NonproceduralModel.java similarity index 95% rename from src/main/java/electrosphere/game/data/graphics/NonproceduralModel.java rename to src/main/java/electrosphere/data/graphics/NonproceduralModel.java index 8877558a..cc19b1e4 100644 --- a/src/main/java/electrosphere/game/data/graphics/NonproceduralModel.java +++ b/src/main/java/electrosphere/data/graphics/NonproceduralModel.java @@ -1,10 +1,10 @@ -package electrosphere.game.data.graphics; +package electrosphere.data.graphics; import java.util.Map; import org.joml.Vector3f; -import electrosphere.game.data.creature.type.IdleData; +import electrosphere.data.creature.IdleData; /** * A non-procedural model diff --git a/src/main/java/electrosphere/game/data/graphics/ProceduralModel.java b/src/main/java/electrosphere/data/graphics/ProceduralModel.java similarity index 78% rename from src/main/java/electrosphere/game/data/graphics/ProceduralModel.java rename to src/main/java/electrosphere/data/graphics/ProceduralModel.java index f78c140f..23f447b2 100644 --- a/src/main/java/electrosphere/game/data/graphics/ProceduralModel.java +++ b/src/main/java/electrosphere/data/graphics/ProceduralModel.java @@ -1,6 +1,6 @@ -package electrosphere.game.data.graphics; +package electrosphere.data.graphics; -import electrosphere.game.data.foliage.type.TreeModel; +import electrosphere.data.foliage.TreeModel; /** * A procedurally-generated model diff --git a/src/main/java/electrosphere/game/data/graphics/ShaderSet.java b/src/main/java/electrosphere/data/graphics/ShaderSet.java similarity index 88% rename from src/main/java/electrosphere/game/data/graphics/ShaderSet.java rename to src/main/java/electrosphere/data/graphics/ShaderSet.java index 18fc3883..10bb36ec 100644 --- a/src/main/java/electrosphere/game/data/graphics/ShaderSet.java +++ b/src/main/java/electrosphere/data/graphics/ShaderSet.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.graphics; +package electrosphere.data.graphics; public class ShaderSet { diff --git a/src/main/java/electrosphere/game/data/grident/GridAlignedData.java b/src/main/java/electrosphere/data/grident/GridAlignedData.java similarity index 96% rename from src/main/java/electrosphere/game/data/grident/GridAlignedData.java rename to src/main/java/electrosphere/data/grident/GridAlignedData.java index ce0902b2..1952c215 100644 --- a/src/main/java/electrosphere/game/data/grident/GridAlignedData.java +++ b/src/main/java/electrosphere/data/grident/GridAlignedData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.grident; +package electrosphere.data.grident; /** * Data for aligning this entity with the block grid diff --git a/src/main/java/electrosphere/game/data/item/EquipData.java b/src/main/java/electrosphere/data/item/EquipData.java similarity index 96% rename from src/main/java/electrosphere/game/data/item/EquipData.java rename to src/main/java/electrosphere/data/item/EquipData.java index 847c6e89..466618b1 100644 --- a/src/main/java/electrosphere/game/data/item/EquipData.java +++ b/src/main/java/electrosphere/data/item/EquipData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/item/EquipWhitelist.java b/src/main/java/electrosphere/data/item/EquipWhitelist.java similarity index 92% rename from src/main/java/electrosphere/game/data/item/EquipWhitelist.java rename to src/main/java/electrosphere/data/item/EquipWhitelist.java index 7fe922f7..75eec4bc 100644 --- a/src/main/java/electrosphere/game/data/item/EquipWhitelist.java +++ b/src/main/java/electrosphere/data/item/EquipWhitelist.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/item/Item.java b/src/main/java/electrosphere/data/item/Item.java similarity index 96% rename from src/main/java/electrosphere/game/data/item/Item.java rename to src/main/java/electrosphere/data/item/Item.java index 33e3feb6..0cfcc1ee 100644 --- a/src/main/java/electrosphere/game/data/item/Item.java +++ b/src/main/java/electrosphere/data/item/Item.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; import java.util.Arrays; import java.util.HashMap; @@ -9,14 +9,14 @@ import java.util.Map; import electrosphere.client.block.BlockChunkData; import electrosphere.client.block.cells.BlockTextureAtlas; import electrosphere.controls.cursor.CursorState; +import electrosphere.data.block.BlockType; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.common.item.SpawnItemDescription; +import electrosphere.data.graphics.GraphicsTemplate; +import electrosphere.data.graphics.NonproceduralModel; +import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; -import electrosphere.game.data.block.BlockType; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.common.item.SpawnItemDescription; -import electrosphere.game.data.graphics.GraphicsTemplate; -import electrosphere.game.data.graphics.NonproceduralModel; -import electrosphere.game.data.voxel.VoxelType; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.RenderUtils; diff --git a/src/main/java/electrosphere/game/data/item/ItemAudio.java b/src/main/java/electrosphere/data/item/ItemAudio.java similarity index 94% rename from src/main/java/electrosphere/game/data/item/ItemAudio.java rename to src/main/java/electrosphere/data/item/ItemAudio.java index e5300c3b..c7377121 100644 --- a/src/main/java/electrosphere/game/data/item/ItemAudio.java +++ b/src/main/java/electrosphere/data/item/ItemAudio.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; /** * Audio data related to the item diff --git a/src/main/java/electrosphere/game/data/item/ItemDataFile.java b/src/main/java/electrosphere/data/item/ItemDataFile.java similarity index 96% rename from src/main/java/electrosphere/game/data/item/ItemDataFile.java rename to src/main/java/electrosphere/data/item/ItemDataFile.java index 3bb13cc3..db9d9d57 100644 --- a/src/main/java/electrosphere/game/data/item/ItemDataFile.java +++ b/src/main/java/electrosphere/data/item/ItemDataFile.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/item/ItemDataMap.java b/src/main/java/electrosphere/data/item/ItemDataMap.java similarity index 93% rename from src/main/java/electrosphere/game/data/item/ItemDataMap.java rename to src/main/java/electrosphere/data/item/ItemDataMap.java index c1bb5ba0..1ffbb3e9 100644 --- a/src/main/java/electrosphere/game/data/item/ItemDataMap.java +++ b/src/main/java/electrosphere/data/item/ItemDataMap.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; import java.util.Collection; import java.util.HashMap; @@ -7,14 +7,14 @@ import java.util.List; import java.util.Map; import java.util.Set; +import electrosphere.data.block.BlockData; +import electrosphere.data.block.BlockType; +import electrosphere.data.common.CommonEntityMap; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.voxel.VoxelData; +import electrosphere.data.voxel.VoxelType; import electrosphere.entity.Entity; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.block.BlockData; -import electrosphere.game.data.block.BlockType; -import electrosphere.game.data.common.CommonEntityMap; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.voxel.VoxelData; -import electrosphere.game.data.voxel.VoxelType; import electrosphere.util.FileUtils; /** diff --git a/src/main/java/electrosphere/game/data/item/ItemFabData.java b/src/main/java/electrosphere/data/item/ItemFabData.java similarity index 93% rename from src/main/java/electrosphere/game/data/item/ItemFabData.java rename to src/main/java/electrosphere/data/item/ItemFabData.java index 348fdeca..cab870a9 100644 --- a/src/main/java/electrosphere/game/data/item/ItemFabData.java +++ b/src/main/java/electrosphere/data/item/ItemFabData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; /** * Data for placing fabs diff --git a/src/main/java/electrosphere/game/data/item/ItemIdStrings.java b/src/main/java/electrosphere/data/item/ItemIdStrings.java similarity index 82% rename from src/main/java/electrosphere/game/data/item/ItemIdStrings.java rename to src/main/java/electrosphere/data/item/ItemIdStrings.java index 7531293f..5c0749ee 100644 --- a/src/main/java/electrosphere/game/data/item/ItemIdStrings.java +++ b/src/main/java/electrosphere/data/item/ItemIdStrings.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; /** * Hardcoded item ids for items diff --git a/src/main/java/electrosphere/game/data/item/ItemUsage.java b/src/main/java/electrosphere/data/item/ItemUsage.java similarity index 98% rename from src/main/java/electrosphere/game/data/item/ItemUsage.java rename to src/main/java/electrosphere/data/item/ItemUsage.java index fa060671..7758d360 100644 --- a/src/main/java/electrosphere/game/data/item/ItemUsage.java +++ b/src/main/java/electrosphere/data/item/ItemUsage.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; /** * Defines what a given use action does with an item diff --git a/src/main/java/electrosphere/game/data/item/WeaponData.java b/src/main/java/electrosphere/data/item/WeaponData.java similarity index 95% rename from src/main/java/electrosphere/game/data/item/WeaponData.java rename to src/main/java/electrosphere/data/item/WeaponData.java index 37b431f9..3e2db956 100644 --- a/src/main/java/electrosphere/game/data/item/WeaponData.java +++ b/src/main/java/electrosphere/data/item/WeaponData.java @@ -1,8 +1,8 @@ -package electrosphere.game.data.item; +package electrosphere.data.item; import java.util.List; -import electrosphere.game.data.collidable.HitboxData; +import electrosphere.data.collidable.HitboxData; /** * Data about a weapon diff --git a/src/main/java/electrosphere/game/data/item/source/ItemSourcingData.java b/src/main/java/electrosphere/data/item/source/ItemSourcingData.java similarity index 91% rename from src/main/java/electrosphere/game/data/item/source/ItemSourcingData.java rename to src/main/java/electrosphere/data/item/source/ItemSourcingData.java index 0942ade2..c6f593d8 100644 --- a/src/main/java/electrosphere/game/data/item/source/ItemSourcingData.java +++ b/src/main/java/electrosphere/data/item/source/ItemSourcingData.java @@ -1,10 +1,10 @@ -package electrosphere.game.data.item.source; +package electrosphere.data.item.source; import java.util.List; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.crafting.RecipeData; -import electrosphere.game.data.foliage.type.FoliageType; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.crafting.RecipeData; +import electrosphere.data.foliage.FoliageType; /** * Data that stores how an item can be sources diff --git a/src/main/java/electrosphere/game/data/item/source/ItemSourcingMap.java b/src/main/java/electrosphere/data/item/source/ItemSourcingMap.java similarity index 86% rename from src/main/java/electrosphere/game/data/item/source/ItemSourcingMap.java rename to src/main/java/electrosphere/data/item/source/ItemSourcingMap.java index 479d34a4..64d74eb9 100644 --- a/src/main/java/electrosphere/game/data/item/source/ItemSourcingMap.java +++ b/src/main/java/electrosphere/data/item/source/ItemSourcingMap.java @@ -1,22 +1,22 @@ -package electrosphere.game.data.item.source; +package electrosphere.data.item.source; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import electrosphere.game.data.Config; -import electrosphere.game.data.common.CommonEntityTokens; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.common.life.loot.LootPool; -import electrosphere.game.data.common.life.loot.LootTicket; -import electrosphere.game.data.crafting.RecipeData; -import electrosphere.game.data.crafting.RecipeDataMap; -import electrosphere.game.data.crafting.RecipeIngredientData; -import electrosphere.game.data.foliage.type.FoliageType; -import electrosphere.game.data.foliage.type.FoliageTypeLoader; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.item.ItemDataMap; +import electrosphere.data.Config; +import electrosphere.data.common.CommonEntityTokens; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.common.life.loot.LootPool; +import electrosphere.data.common.life.loot.LootTicket; +import electrosphere.data.crafting.RecipeData; +import electrosphere.data.crafting.RecipeDataMap; +import electrosphere.data.crafting.RecipeIngredientData; +import electrosphere.data.foliage.FoliageType; +import electrosphere.data.foliage.FoliageTypeLoader; +import electrosphere.data.item.Item; +import electrosphere.data.item.ItemDataMap; /** * Map of items to the methods to source them diff --git a/src/main/java/electrosphere/game/data/item/source/ItemSourcingTree.java b/src/main/java/electrosphere/data/item/source/ItemSourcingTree.java similarity index 95% rename from src/main/java/electrosphere/game/data/item/source/ItemSourcingTree.java rename to src/main/java/electrosphere/data/item/source/ItemSourcingTree.java index ac20d7ad..e6e665b0 100644 --- a/src/main/java/electrosphere/game/data/item/source/ItemSourcingTree.java +++ b/src/main/java/electrosphere/data/item/source/ItemSourcingTree.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.item.source; +package electrosphere.data.item.source; import java.util.HashMap; import java.util.LinkedList; @@ -6,14 +6,14 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import electrosphere.data.common.CommonEntityTokens; +import electrosphere.data.crafting.RecipeData; +import electrosphere.data.crafting.RecipeIngredientData; +import electrosphere.data.item.ItemIdStrings; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.common.CommonEntityTokens; -import electrosphere.game.data.crafting.RecipeData; -import electrosphere.game.data.crafting.RecipeIngredientData; -import electrosphere.game.data.item.ItemIdStrings; /** * A tree of dependencies to acquire a final item diff --git a/src/main/java/electrosphere/game/data/math/ScalarGenerator.java b/src/main/java/electrosphere/data/math/ScalarGenerator.java similarity index 96% rename from src/main/java/electrosphere/game/data/math/ScalarGenerator.java rename to src/main/java/electrosphere/data/math/ScalarGenerator.java index 1d8e1ddd..d5b54c45 100644 --- a/src/main/java/electrosphere/game/data/math/ScalarGenerator.java +++ b/src/main/java/electrosphere/data/math/ScalarGenerator.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.math; +package electrosphere.data.math; /** * A defintion of a function that generates a scalar diff --git a/src/main/java/electrosphere/game/data/particle/ParticleData.java b/src/main/java/electrosphere/data/particle/ParticleData.java similarity index 98% rename from src/main/java/electrosphere/game/data/particle/ParticleData.java rename to src/main/java/electrosphere/data/particle/ParticleData.java index c1ac4015..8a5db6d3 100644 --- a/src/main/java/electrosphere/game/data/particle/ParticleData.java +++ b/src/main/java/electrosphere/data/particle/ParticleData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.particle; +package electrosphere.data.particle; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/game/data/particle/ParticleDefinition.java b/src/main/java/electrosphere/data/particle/ParticleDefinition.java similarity index 88% rename from src/main/java/electrosphere/game/data/particle/ParticleDefinition.java rename to src/main/java/electrosphere/data/particle/ParticleDefinition.java index e6f10ec8..2ef73635 100644 --- a/src/main/java/electrosphere/game/data/particle/ParticleDefinition.java +++ b/src/main/java/electrosphere/data/particle/ParticleDefinition.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.particle; +package electrosphere.data.particle; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/particle/ParticleEmitter.java b/src/main/java/electrosphere/data/particle/ParticleEmitter.java similarity index 97% rename from src/main/java/electrosphere/game/data/particle/ParticleEmitter.java rename to src/main/java/electrosphere/data/particle/ParticleEmitter.java index 725cc093..743d3222 100644 --- a/src/main/java/electrosphere/game/data/particle/ParticleEmitter.java +++ b/src/main/java/electrosphere/data/particle/ParticleEmitter.java @@ -1,9 +1,9 @@ -package electrosphere.game.data.particle; +package electrosphere.data.particle; import org.joml.Vector3d; -import electrosphere.game.data.color.ColorRange; -import electrosphere.game.data.math.ScalarGenerator; +import electrosphere.data.color.ColorRange; +import electrosphere.data.math.ScalarGenerator; /** * Describes a particle emitter diff --git a/src/main/java/electrosphere/game/data/projectile/ProjectileType.java b/src/main/java/electrosphere/data/projectile/ProjectileType.java similarity index 92% rename from src/main/java/electrosphere/game/data/projectile/ProjectileType.java rename to src/main/java/electrosphere/data/projectile/ProjectileType.java index 33f7f522..0b17f486 100644 --- a/src/main/java/electrosphere/game/data/projectile/ProjectileType.java +++ b/src/main/java/electrosphere/data/projectile/ProjectileType.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.projectile; +package electrosphere.data.projectile; public class ProjectileType { diff --git a/src/main/java/electrosphere/game/data/projectile/ProjectileTypeHolder.java b/src/main/java/electrosphere/data/projectile/ProjectileTypeHolder.java similarity index 92% rename from src/main/java/electrosphere/game/data/projectile/ProjectileTypeHolder.java rename to src/main/java/electrosphere/data/projectile/ProjectileTypeHolder.java index 78451dba..05de590a 100644 --- a/src/main/java/electrosphere/game/data/projectile/ProjectileTypeHolder.java +++ b/src/main/java/electrosphere/data/projectile/ProjectileTypeHolder.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.projectile; +package electrosphere.data.projectile; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/electrosphere/game/config/UserSettings.java b/src/main/java/electrosphere/data/settings/UserSettings.java similarity index 99% rename from src/main/java/electrosphere/game/config/UserSettings.java rename to src/main/java/electrosphere/data/settings/UserSettings.java index cdc0f714..ae8943f9 100644 --- a/src/main/java/electrosphere/game/config/UserSettings.java +++ b/src/main/java/electrosphere/data/settings/UserSettings.java @@ -1,4 +1,4 @@ -package electrosphere.game.config; +package electrosphere.data.settings; import electrosphere.engine.Globals; import electrosphere.logger.LoggerInterface; diff --git a/src/main/java/electrosphere/game/data/struct/StructureData.java b/src/main/java/electrosphere/data/struct/StructureData.java similarity index 97% rename from src/main/java/electrosphere/game/data/struct/StructureData.java rename to src/main/java/electrosphere/data/struct/StructureData.java index b3d418bd..361d5631 100644 --- a/src/main/java/electrosphere/game/data/struct/StructureData.java +++ b/src/main/java/electrosphere/data/struct/StructureData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.struct; +package electrosphere.data.struct; import org.joml.Vector3d; diff --git a/src/main/java/electrosphere/game/data/struct/StructureDataFile.java b/src/main/java/electrosphere/data/struct/StructureDataFile.java similarity index 96% rename from src/main/java/electrosphere/game/data/struct/StructureDataFile.java rename to src/main/java/electrosphere/data/struct/StructureDataFile.java index 5bcae67c..b429cfe2 100644 --- a/src/main/java/electrosphere/game/data/struct/StructureDataFile.java +++ b/src/main/java/electrosphere/data/struct/StructureDataFile.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.struct; +package electrosphere.data.struct; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/struct/StructureDataLoader.java b/src/main/java/electrosphere/data/struct/StructureDataLoader.java similarity index 98% rename from src/main/java/electrosphere/game/data/struct/StructureDataLoader.java rename to src/main/java/electrosphere/data/struct/StructureDataLoader.java index a044baf1..526c4db7 100644 --- a/src/main/java/electrosphere/game/data/struct/StructureDataLoader.java +++ b/src/main/java/electrosphere/data/struct/StructureDataLoader.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.struct; +package electrosphere.data.struct; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/electrosphere/game/data/tutorial/HintDefinition.java b/src/main/java/electrosphere/data/tutorial/HintDefinition.java similarity index 94% rename from src/main/java/electrosphere/game/data/tutorial/HintDefinition.java rename to src/main/java/electrosphere/data/tutorial/HintDefinition.java index ae4a9464..9991431d 100644 --- a/src/main/java/electrosphere/game/data/tutorial/HintDefinition.java +++ b/src/main/java/electrosphere/data/tutorial/HintDefinition.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.tutorial; +package electrosphere.data.tutorial; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/tutorial/TutorialHint.java b/src/main/java/electrosphere/data/tutorial/TutorialHint.java similarity index 95% rename from src/main/java/electrosphere/game/data/tutorial/TutorialHint.java rename to src/main/java/electrosphere/data/tutorial/TutorialHint.java index 14de7ff2..ffd534ee 100644 --- a/src/main/java/electrosphere/game/data/tutorial/TutorialHint.java +++ b/src/main/java/electrosphere/data/tutorial/TutorialHint.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.tutorial; +package electrosphere.data.tutorial; /** * A hint that can be shown as a popup in game diff --git a/src/main/java/electrosphere/game/data/units/UnitDefinition.java b/src/main/java/electrosphere/data/units/UnitDefinition.java similarity index 91% rename from src/main/java/electrosphere/game/data/units/UnitDefinition.java rename to src/main/java/electrosphere/data/units/UnitDefinition.java index 827f5bed..21264f8f 100644 --- a/src/main/java/electrosphere/game/data/units/UnitDefinition.java +++ b/src/main/java/electrosphere/data/units/UnitDefinition.java @@ -1,8 +1,8 @@ -package electrosphere.game.data.units; +package electrosphere.data.units; import java.util.List; -import electrosphere.game.data.creature.type.ai.AITreeData; +import electrosphere.data.creature.ai.AITreeData; /** * A creature associated with some equipment and AI diff --git a/src/main/java/electrosphere/game/data/units/UnitDefinitionFile.java b/src/main/java/electrosphere/data/units/UnitDefinitionFile.java similarity index 90% rename from src/main/java/electrosphere/game/data/units/UnitDefinitionFile.java rename to src/main/java/electrosphere/data/units/UnitDefinitionFile.java index 772d2020..2cf8a9a5 100644 --- a/src/main/java/electrosphere/game/data/units/UnitDefinitionFile.java +++ b/src/main/java/electrosphere/data/units/UnitDefinitionFile.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.units; +package electrosphere.data.units; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/units/UnitEquippedItem.java b/src/main/java/electrosphere/data/units/UnitEquippedItem.java similarity index 93% rename from src/main/java/electrosphere/game/data/units/UnitEquippedItem.java rename to src/main/java/electrosphere/data/units/UnitEquippedItem.java index 8491a7c3..7f1e9e37 100644 --- a/src/main/java/electrosphere/game/data/units/UnitEquippedItem.java +++ b/src/main/java/electrosphere/data/units/UnitEquippedItem.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.units; +package electrosphere.data.units; /** * An item equipped to a unit diff --git a/src/main/java/electrosphere/game/data/units/UnitLoader.java b/src/main/java/electrosphere/data/units/UnitLoader.java similarity index 97% rename from src/main/java/electrosphere/game/data/units/UnitLoader.java rename to src/main/java/electrosphere/data/units/UnitLoader.java index 140df99a..1615d3a3 100644 --- a/src/main/java/electrosphere/game/data/units/UnitLoader.java +++ b/src/main/java/electrosphere/data/units/UnitLoader.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.units; +package electrosphere.data.units; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/electrosphere/game/data/utils/DataFormatUtil.java b/src/main/java/electrosphere/data/utils/DataFormatUtil.java similarity index 97% rename from src/main/java/electrosphere/game/data/utils/DataFormatUtil.java rename to src/main/java/electrosphere/data/utils/DataFormatUtil.java index 1ce0cea7..37cab40c 100644 --- a/src/main/java/electrosphere/game/data/utils/DataFormatUtil.java +++ b/src/main/java/electrosphere/data/utils/DataFormatUtil.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.utils; +package electrosphere.data.utils; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/voxel/VoxelData.java b/src/main/java/electrosphere/data/voxel/VoxelData.java similarity index 96% rename from src/main/java/electrosphere/game/data/voxel/VoxelData.java rename to src/main/java/electrosphere/data/voxel/VoxelData.java index f0ec70c9..3b96d0eb 100644 --- a/src/main/java/electrosphere/game/data/voxel/VoxelData.java +++ b/src/main/java/electrosphere/data/voxel/VoxelData.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.voxel; +package electrosphere.data.voxel; import java.util.Set; diff --git a/src/main/java/electrosphere/game/data/voxel/VoxelType.java b/src/main/java/electrosphere/data/voxel/VoxelType.java similarity index 97% rename from src/main/java/electrosphere/game/data/voxel/VoxelType.java rename to src/main/java/electrosphere/data/voxel/VoxelType.java index cb77056a..8f0229fa 100644 --- a/src/main/java/electrosphere/game/data/voxel/VoxelType.java +++ b/src/main/java/electrosphere/data/voxel/VoxelType.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.voxel; +package electrosphere.data.voxel; import java.util.List; diff --git a/src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java b/src/main/java/electrosphere/data/voxel/sampler/SamplerFile.java similarity index 98% rename from src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java rename to src/main/java/electrosphere/data/voxel/sampler/SamplerFile.java index 6de0908e..7a27cea4 100644 --- a/src/main/java/electrosphere/game/data/voxel/sampler/SamplerFile.java +++ b/src/main/java/electrosphere/data/voxel/sampler/SamplerFile.java @@ -1,4 +1,4 @@ -package electrosphere.game.data.voxel.sampler; +package electrosphere.data.voxel.sampler; import java.io.File; import java.util.LinkedList; diff --git a/src/main/java/electrosphere/engine/Globals.java b/src/main/java/electrosphere/engine/Globals.java index ffae03a7..a233d0bd 100644 --- a/src/main/java/electrosphere/engine/Globals.java +++ b/src/main/java/electrosphere/engine/Globals.java @@ -38,6 +38,10 @@ import electrosphere.controls.ControlHandler; import electrosphere.controls.MouseCallback; import electrosphere.controls.ScrollCallback; import electrosphere.controls.cursor.CursorState; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.particle.ParticleDefinition; +import electrosphere.data.settings.UserSettings; +import electrosphere.data.voxel.VoxelType; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.assetmanager.AssetManager; import electrosphere.engine.loadingthreads.InitialAssetLoading; @@ -50,10 +54,6 @@ import electrosphere.engine.threads.ThreadManager; import electrosphere.engine.time.Timekeeper; import electrosphere.entity.Entity; import electrosphere.entity.scene.Scene; -import electrosphere.game.config.UserSettings; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.particle.ParticleDefinition; -import electrosphere.game.data.voxel.VoxelType; import electrosphere.logger.LoggerInterface; import electrosphere.net.client.ClientNetworking; import electrosphere.net.config.NetConfig; @@ -216,8 +216,8 @@ public class Globals { // // Game config // - public static electrosphere.game.data.Config gameConfigDefault; - public static electrosphere.game.data.Config gameConfigCurrent; + public static electrosphere.data.Config gameConfigDefault; + public static electrosphere.data.Config gameConfigCurrent; // // Database stuff @@ -514,7 +514,7 @@ public class Globals { Globals.clientFluidManager = new ClientFluidManager(); Globals.clientBlockManager = new ClientBlockManager(); //game config - gameConfigDefault = electrosphere.game.data.Config.loadDefaultConfig(); + gameConfigDefault = electrosphere.data.Config.loadDefaultConfig(); gameConfigCurrent = gameConfigDefault; NetConfig.readNetConfig(); diff --git a/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java b/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java index 13610108..6d7aabdc 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/InitialAssetLoading.java @@ -11,14 +11,14 @@ import javax.imageio.ImageIO; import electrosphere.client.block.cells.BlockTextureAtlas; import electrosphere.client.terrain.cells.VoxelTextureAtlas; +import electrosphere.data.block.BlockData; +import electrosphere.data.block.BlockType; +import electrosphere.data.item.Item; +import electrosphere.data.voxel.VoxelData; +import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.engine.assetmanager.queue.QueuedTexture; -import electrosphere.game.data.block.BlockData; -import electrosphere.game.data.block.BlockType; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.voxel.VoxelData; -import electrosphere.game.data.voxel.VoxelType; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.RenderUtils; import electrosphere.renderer.texture.TextureAtlas; diff --git a/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java b/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java index d9fbc17e..0623b7ea 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java @@ -11,12 +11,12 @@ import org.joml.Vector3f; import org.joml.Vector3i; import electrosphere.auth.AuthenticationManager; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.engine.threads.LabeledThread.ThreadLabel; 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.VisualAttribute; import electrosphere.logger.LoggerInterface; import electrosphere.net.NetUtils; import electrosphere.net.client.ClientNetworking; diff --git a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java index ce1a4646..0ca00f81 100644 --- a/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java +++ b/src/main/java/electrosphere/entity/btree/StateTransitionUtil.java @@ -3,13 +3,13 @@ package electrosphere.entity.btree; import java.util.function.Supplier; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.common.treedata.TreeDataAudio; +import electrosphere.data.common.treedata.TreeDataState; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityUtils; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.common.treedata.TreeDataAudio; -import electrosphere.game.data.common.treedata.TreeDataState; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.actor.Actor; import electrosphere.server.entity.poseactor.PoseActor; diff --git a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java index 2af56110..ef838eda 100644 --- a/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ClientAttackTree.java @@ -1,6 +1,9 @@ package electrosphere.entity.state.attack; +import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.creature.attack.AttackMove; +import electrosphere.data.item.WeaponData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -21,9 +24,6 @@ import electrosphere.entity.state.rotator.RotatorTree; import electrosphere.entity.types.collision.CollisionObjUtils; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.common.treedata.TreeDataState; -import electrosphere.game.data.creature.type.attack.AttackMove; -import electrosphere.game.data.item.WeaponData; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; diff --git a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java index f22a8151..f094bf22 100644 --- a/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java +++ b/src/main/java/electrosphere/entity/state/attack/ServerAttackTree.java @@ -4,7 +4,10 @@ package electrosphere.entity.state.attack; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.server.datacell.utils.DataCellSearchUtils; - +import electrosphere.data.common.treedata.TreeDataState; +import electrosphere.data.creature.attack.AttackMove; +import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.item.WeaponData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -28,10 +31,6 @@ import electrosphere.entity.types.collision.CollisionObjUtils; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; import electrosphere.entity.types.projectile.ProjectileUtils; -import electrosphere.game.data.common.treedata.TreeDataState; -import electrosphere.game.data.creature.type.attack.AttackMove; -import electrosphere.game.data.creature.type.equip.EquipPoint; -import electrosphere.game.data.item.WeaponData; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.synchronization.annotation.SyncedField; diff --git a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java index df46870f..63cac3be 100644 --- a/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ClientBlockTree.java @@ -1,14 +1,14 @@ package electrosphere.entity.state.block; +import electrosphere.data.creature.block.BlockSystem; +import electrosphere.data.creature.block.BlockVariant; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.StateTransitionUtil; import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; -import electrosphere.game.data.creature.type.block.BlockSystem; -import electrosphere.game.data.creature.type.block.BlockVariant; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java index 273a720e..b962e82c 100644 --- a/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java +++ b/src/main/java/electrosphere/entity/state/block/ServerBlockTree.java @@ -3,6 +3,8 @@ package electrosphere.entity.state.block; import java.util.List; +import electrosphere.data.creature.block.BlockSystem; +import electrosphere.data.creature.block.BlockVariant; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -16,8 +18,6 @@ import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.entity.state.attach.AttachUtils; import electrosphere.entity.state.block.ClientBlockTree.BlockState; import electrosphere.entity.state.hitbox.HitboxCollectionState; -import electrosphere.game.data.creature.type.block.BlockSystem; -import electrosphere.game.data.creature.type.block.BlockVariant; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; diff --git a/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java b/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java index 72d9e3c8..c7b73e27 100644 --- a/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java +++ b/src/main/java/electrosphere/entity/state/client/ambientaudio/ClientAmbientAudioTree.java @@ -4,12 +4,12 @@ import org.joml.Vector3d; import electrosphere.audio.VirtualAudioSource; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; +import electrosphere.data.foliage.AmbientAudio; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; -import electrosphere.game.data.foliage.type.AmbientAudio; /** * diff --git a/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java b/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java index dc429c48..b09cc1ec 100644 --- a/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java +++ b/src/main/java/electrosphere/entity/state/client/firstPerson/FirstPersonTree.java @@ -1,11 +1,11 @@ package electrosphere.entity.state.client.firstPerson; +import electrosphere.data.common.treedata.TreeDataAnimation; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; -import electrosphere.game.data.common.treedata.TreeDataAnimation; import electrosphere.renderer.actor.Actor; /** diff --git a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java index 7d24d378..4fcc9b2e 100644 --- a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java +++ b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleEmitterComponent.java @@ -4,14 +4,14 @@ import org.joml.Quaterniond; import org.joml.Random; import org.joml.Vector3d; +import electrosphere.data.particle.ParticleData; +import electrosphere.data.particle.ParticleEmitter; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.equip.ClientEquipState; -import electrosphere.game.data.particle.ParticleData; -import electrosphere.game.data.particle.ParticleEmitter; import electrosphere.util.math.SpatialMathUtils; /** diff --git a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java index 4ca6ac98..c8732518 100644 --- a/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java +++ b/src/main/java/electrosphere/entity/state/client/particle/ClientParticleTree.java @@ -10,14 +10,14 @@ import org.joml.Vector3f; import org.joml.Vector4f; import electrosphere.client.entity.camera.CameraEntityUtils; +import electrosphere.data.particle.ParticleData; +import electrosphere.data.particle.ParticleEmitter; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; -import electrosphere.game.data.particle.ParticleData; -import electrosphere.game.data.particle.ParticleEmitter; import electrosphere.renderer.actor.instance.InstancedActor; import electrosphere.renderer.texture.TextureAtlas; diff --git a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java index 352985c0..11f2e59d 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ClientEquipState.java @@ -7,6 +7,10 @@ import java.util.List; import java.util.Map; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.item.EquipWhitelist; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; @@ -20,10 +24,6 @@ import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.equip.EquipPoint; -import electrosphere.game.data.item.EquipWhitelist; -import electrosphere.game.data.item.Item; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.parser.net.message.NetworkMessage; diff --git a/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java b/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java index 3f0d83f2..585d019d 100644 --- a/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java +++ b/src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java @@ -9,18 +9,18 @@ import electrosphere.entity.state.inventory.InventoryUtils; import electrosphere.entity.state.inventory.RelationalInventoryState; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.block.BlockFab; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.equip.EquipPoint; -import electrosphere.game.data.creature.type.equip.ToolbarData; -import electrosphere.game.data.item.EquipWhitelist; -import electrosphere.game.data.item.Item; import java.util.List; import electrosphere.client.ui.menu.ingame.ToolbarPreviewWindow; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.controls.cursor.CursorState; +import electrosphere.data.block.BlockFab; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.creature.equip.ToolbarData; +import electrosphere.data.item.EquipWhitelist; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.ClientEntityUtils; diff --git a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java index cabf793e..f4feb5a8 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java +++ b/src/main/java/electrosphere/entity/state/equip/ServerEquipState.java @@ -11,6 +11,11 @@ import java.util.Map; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.block.BlockSystem; +import electrosphere.data.creature.block.BlockVariant; +import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.item.EquipWhitelist; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -26,11 +31,6 @@ import electrosphere.entity.state.inventory.RelationalInventoryState; import electrosphere.entity.state.inventory.UnrelationalInventoryState; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.block.BlockSystem; -import electrosphere.game.data.creature.type.block.BlockVariant; -import electrosphere.game.data.creature.type.equip.EquipPoint; -import electrosphere.game.data.item.EquipWhitelist; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.parser.net.message.NetworkMessage; diff --git a/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java b/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java index fddec8f3..e7678b98 100644 --- a/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java +++ b/src/main/java/electrosphere/entity/state/equip/ServerToolbarState.java @@ -10,17 +10,17 @@ import electrosphere.entity.state.inventory.RelationalInventoryState; import electrosphere.entity.state.inventory.UnrelationalInventoryState; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.creature.type.block.BlockSystem; -import electrosphere.game.data.creature.type.block.BlockVariant; -import electrosphere.game.data.creature.type.equip.EquipPoint; -import electrosphere.game.data.creature.type.equip.ToolbarData; -import electrosphere.game.data.item.EquipWhitelist; import java.util.List; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.creature.block.BlockSystem; +import electrosphere.data.creature.block.BlockVariant; +import electrosphere.data.creature.equip.EquipPoint; +import electrosphere.data.creature.equip.ToolbarData; +import electrosphere.data.item.EquipWhitelist; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java index 78394b72..1653fa05 100644 --- a/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java +++ b/src/main/java/electrosphere/entity/state/furniture/ClientDoorState.java @@ -5,6 +5,7 @@ import org.joml.Quaterniond; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.furniture.DoorData; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; @@ -14,7 +15,6 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.StateTransitionUtil; import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; import electrosphere.entity.types.collision.CollisionObjUtils; -import electrosphere.game.data.furniture.DoorData; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java index 9063937a..0945de00 100644 --- a/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java +++ b/src/main/java/electrosphere/entity/state/furniture/ServerDoorState.java @@ -4,6 +4,7 @@ package electrosphere.entity.state.furniture; import org.joml.Vector3d; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.furniture.DoorData; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; @@ -19,7 +20,6 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.StateTransitionUtil; import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; import electrosphere.entity.state.furniture.ClientDoorState.DoorState; -import electrosphere.game.data.furniture.DoorData; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java b/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java index eb1f57c3..99a5d584 100644 --- a/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java +++ b/src/main/java/electrosphere/entity/state/hitbox/HitboxCollectionState.java @@ -17,14 +17,14 @@ import electrosphere.collision.PhysicsUtils; import electrosphere.collision.collidable.Collidable; import electrosphere.collision.hitbox.HitboxManager; import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback; +import electrosphere.data.collidable.HitboxData; +import electrosphere.data.utils.DataFormatUtil; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.state.attach.AttachUtils; import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState.HitboxShapeType; -import electrosphere.game.data.collidable.HitboxData; -import electrosphere.game.data.utils.DataFormatUtil; import electrosphere.logger.LoggerInterface; import electrosphere.server.datacell.Realm; import electrosphere.server.entity.poseactor.PoseActor; diff --git a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java index aed1d4af..fadacd79 100644 --- a/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ClientIdleTree.java @@ -4,13 +4,13 @@ package electrosphere.entity.state.idle; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; +import electrosphere.data.creature.IdleData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.IdleData; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java index 3488c521..260bdf8c 100644 --- a/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java +++ b/src/main/java/electrosphere/entity/state/idle/ServerIdleTree.java @@ -6,13 +6,13 @@ import electrosphere.entity.state.attack.ServerAttackTree; import electrosphere.entity.state.idle.ClientIdleTree.IdleTreeState; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; +import electrosphere.data.creature.IdleData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.IdleData; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.annotation.SyncedField; diff --git a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java index 26749ec3..763712e4 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/ClientInventoryState.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import electrosphere.client.ui.menu.WindowUtils; +import electrosphere.data.creature.equip.EquipPoint; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; @@ -12,7 +13,6 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.equip.ClientEquipState; import electrosphere.entity.state.equip.ClientToolbarState; import electrosphere.entity.state.item.ClientChargeState; -import electrosphere.game.data.creature.type.equip.EquipPoint; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.server.protocol.InventoryProtocol; diff --git a/src/main/java/electrosphere/entity/state/inventory/InventoryUtils.java b/src/main/java/electrosphere/entity/state/inventory/InventoryUtils.java index 248d3983..0f31bfb9 100644 --- a/src/main/java/electrosphere/entity/state/inventory/InventoryUtils.java +++ b/src/main/java/electrosphere/entity/state/inventory/InventoryUtils.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import org.joml.Vector3d; import electrosphere.audio.VirtualAudioSourceManager.VirtualAudioSourceType; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.ClientEntityUtils; @@ -22,7 +23,6 @@ import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.entity.state.item.ServerChargeState; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.item.Item; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.InventoryMessage; diff --git a/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java index ff9a2e83..a2dab87d 100644 --- a/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/RelationalInventoryState.java @@ -6,9 +6,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import electrosphere.data.creature.equip.EquipPoint; import electrosphere.entity.Entity; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.creature.type.equip.EquipPoint; import electrosphere.logger.LoggerInterface; public class RelationalInventoryState { diff --git a/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java b/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java index b21d81a9..d7c41d42 100644 --- a/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java +++ b/src/main/java/electrosphere/entity/state/inventory/ServerInventoryState.java @@ -3,11 +3,11 @@ package electrosphere.entity.state.inventory; import java.util.LinkedList; import java.util.List; +import electrosphere.data.creature.equip.EquipPoint; import electrosphere.entity.Entity; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.equip.ServerEquipState; import electrosphere.entity.state.equip.ServerToolbarState; -import electrosphere.game.data.creature.type.equip.EquipPoint; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.server.datacell.utils.EntityLookupUtils; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; diff --git a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java index ed86cc8a..5add4692 100644 --- a/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java +++ b/src/main/java/electrosphere/entity/state/life/ClientLifeTree.java @@ -4,9 +4,9 @@ package electrosphere.entity.state.life; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.btree.StateTransitionUtil; import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; -import electrosphere.game.data.common.life.HealthSystem; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.Entity; +import electrosphere.data.common.life.HealthSystem; import electrosphere.engine.Globals; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; diff --git a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java index 6d1ea95d..322ef4f5 100644 --- a/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java +++ b/src/main/java/electrosphere/entity/state/life/ServerLifeTree.java @@ -20,14 +20,14 @@ import java.util.Random; import org.joml.Vector3d; +import electrosphere.data.collidable.HitboxData; +import electrosphere.data.common.life.HealthSystem; +import electrosphere.data.common.life.loot.LootTicket; import electrosphere.engine.Globals; import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState; import electrosphere.entity.state.life.ClientLifeTree.LifeStateEnum; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.collidable.HitboxData; -import electrosphere.game.data.common.life.HealthSystem; -import electrosphere.game.data.common.life.loot.LootTicket; import electrosphere.logger.LoggerInterface; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java b/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java index 68d4476c..71dfbbb7 100644 --- a/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java +++ b/src/main/java/electrosphere/entity/state/light/ClientPointLightComponent.java @@ -3,13 +3,13 @@ package electrosphere.entity.state.light; import org.joml.Vector3d; import org.joml.Vector3f; +import electrosphere.data.common.light.PointLightDescription; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.equip.ClientEquipState; -import electrosphere.game.data.common.light.PointLightDescription; import electrosphere.renderer.light.PointLight; /** diff --git a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java index ae68b8d0..34754012 100644 --- a/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/editor/ClientEditorMovementTree.java @@ -3,9 +3,9 @@ package electrosphere.entity.state.movement.editor; import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.client.scene.ClientWorldData; +import electrosphere.data.creature.movement.EditorMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.movement.EditorMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java index fe25ab29..26cc234f 100644 --- a/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/editor/ServerEditorMovementTree.java @@ -5,9 +5,9 @@ import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.client.entity.camera.CameraEntityUtils; +import electrosphere.data.creature.movement.EditorMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.movement.EditorMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java index d1cb3e62..125937a0 100644 --- a/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/ClientFallTree.java @@ -2,6 +2,7 @@ package electrosphere.entity.state.movement.fall; import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; +import electrosphere.data.creature.movement.FallMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -13,7 +14,6 @@ import electrosphere.entity.state.AnimationPriorities; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.gravity.ClientGravityTree; import electrosphere.entity.state.movement.jump.ClientJumpTree; -import electrosphere.game.data.creature.type.movement.FallMovementSystem; import electrosphere.renderer.actor.Actor; /** diff --git a/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java index 85d1239a..b762373a 100644 --- a/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java +++ b/src/main/java/electrosphere/entity/state/movement/fall/ServerFallTree.java @@ -1,5 +1,7 @@ package electrosphere.entity.state.movement.fall; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.movement.FallMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; @@ -8,8 +10,6 @@ import electrosphere.entity.btree.StateTransitionUtil; import electrosphere.entity.btree.StateTransitionUtil.StateTransitionUtilItem; import electrosphere.entity.state.gravity.ServerGravityTree; import electrosphere.entity.state.movement.jump.ServerJumpTree; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.movement.FallMovementSystem; import electrosphere.server.entity.poseactor.PoseActor; public class ServerFallTree implements BehaviorTree { diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java index e33b53af..f392909a 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ClientGroundMovementTree.java @@ -6,10 +6,10 @@ import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; +import electrosphere.data.creature.movement.GroundMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.collision.CollisionObjUtils; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.movement.GroundMovementSystem; import electrosphere.logger.LoggerInterface; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; diff --git a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java index 86f92fa2..0bcf46f5 100644 --- a/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java +++ b/src/main/java/electrosphere/entity/state/movement/groundmove/ServerGroundMovementTree.java @@ -8,9 +8,9 @@ import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; +import electrosphere.data.creature.movement.GroundMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.movement.GroundMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java index 03b01e71..13ac3472 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ClientJumpTree.java @@ -9,6 +9,7 @@ import org.ode4j.ode.DBody; import electrosphere.audio.movement.MovementAudioService.InteractionType; import electrosphere.client.terrain.sampling.ClientVoxelSampler; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.creature.movement.JumpMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; @@ -17,7 +18,6 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.AnimationPriorities; import electrosphere.entity.state.client.firstPerson.FirstPersonTree; import electrosphere.entity.state.gravity.GravityUtils; -import electrosphere.game.data.creature.type.movement.JumpMovementSystem; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java index 36c3b5c5..65be6826 100644 --- a/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java +++ b/src/main/java/electrosphere/entity/state/movement/jump/ServerJumpTree.java @@ -10,6 +10,7 @@ import org.ode4j.math.DVector3C; import org.ode4j.ode.DBody; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.creature.movement.JumpMovementSystem; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; @@ -17,7 +18,6 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.AnimationPriorities; import electrosphere.entity.state.gravity.GravityUtils; import electrosphere.entity.state.movement.jump.ClientJumpTree.JumpState; -import electrosphere.game.data.creature.type.movement.JumpMovementSystem; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java index 08fbaa2b..64f25295 100644 --- a/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java +++ b/src/main/java/electrosphere/entity/state/movement/sprint/ClientSprintTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.movement.sprint; +import electrosphere.data.creature.SprintSystem; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.server.ServerSynchronizationManager; @@ -8,7 +9,6 @@ import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; import electrosphere.entity.Entity; import electrosphere.entity.btree.BehaviorTree; -import electrosphere.game.data.creature.type.SprintSystem; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java b/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java index 6102856a..29281ce3 100644 --- a/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java +++ b/src/main/java/electrosphere/entity/state/movement/sprint/ServerSprintTree.java @@ -4,6 +4,7 @@ package electrosphere.entity.state.movement.sprint; import electrosphere.net.synchronization.enums.FieldIdEnums; import electrosphere.server.datacell.utils.DataCellSearchUtils; import electrosphere.net.parser.net.message.SynchronizationMessage; +import electrosphere.data.creature.SprintSystem; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; @@ -13,7 +14,6 @@ import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementTreeState; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.state.movement.sprint.ClientSprintTree.SprintTreeState; -import electrosphere.game.data.creature.type.SprintSystem; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java index cf80c1e0..d93402c2 100644 --- a/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java +++ b/src/main/java/electrosphere/entity/state/movement/walk/ClientWalkTree.java @@ -4,11 +4,11 @@ package electrosphere.entity.state.movement.walk; import electrosphere.net.synchronization.server.ServerSynchronizationManager; import electrosphere.net.parser.net.message.SynchronizationMessage; import electrosphere.net.synchronization.enums.BehaviorTreeIdEnums; +import electrosphere.data.creature.movement.WalkMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.btree.BehaviorTree; -import electrosphere.game.data.creature.type.movement.WalkMovementSystem; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizableEnum; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java index 0917215a..04b33fa7 100644 --- a/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java +++ b/src/main/java/electrosphere/entity/state/movement/walk/ServerWalkTree.java @@ -1,6 +1,7 @@ package electrosphere.entity.state.movement.walk; +import electrosphere.data.creature.movement.WalkMovementSystem; import electrosphere.engine.Globals; import electrosphere.entity.EntityDataStrings; import electrosphere.net.synchronization.enums.FieldIdEnums; @@ -11,7 +12,6 @@ import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.entity.Entity; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.movement.walk.ClientWalkTree.WalkState; -import electrosphere.game.data.creature.type.movement.WalkMovementSystem; import electrosphere.net.synchronization.annotation.SyncedField; import electrosphere.net.synchronization.annotation.SynchronizedBehaviorTree; diff --git a/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java b/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java index 39a18449..5547cba6 100644 --- a/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java +++ b/src/main/java/electrosphere/entity/state/rotator/RotatorConstraint.java @@ -8,7 +8,7 @@ public class RotatorConstraint { float allowedMarginPitch; float allowedMarginYaw; - public RotatorConstraint(electrosphere.game.data.creature.type.rotator.RotatorConstraint data){ + public RotatorConstraint(electrosphere.data.creature.rotator.RotatorConstraint data){ followsBone = data.getFollowsBone(); followsView = data.getFollowsView(); parentBone = data.getParentBone(); diff --git a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java index c527e3d3..edc3f173 100644 --- a/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java +++ b/src/main/java/electrosphere/entity/types/common/CommonEntityUtils.java @@ -12,6 +12,23 @@ import org.ode4j.ode.DBody; import electrosphere.client.interact.ClientInteractionEngine; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; +import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.SprintSystem; +import electrosphere.data.creature.attack.AttackMove; +import electrosphere.data.creature.movement.EditorMovementSystem; +import electrosphere.data.creature.movement.FallMovementSystem; +import electrosphere.data.creature.movement.GroundMovementSystem; +import electrosphere.data.creature.movement.JumpMovementSystem; +import electrosphere.data.creature.movement.MovementSystem; +import electrosphere.data.creature.movement.WalkMovementSystem; +import electrosphere.data.creature.rotator.RotatorConstraint; +import electrosphere.data.creature.rotator.RotatorItem; +import electrosphere.data.creature.rotator.RotatorSystem; +import electrosphere.data.foliage.FoliageType; +import electrosphere.data.graphics.GraphicsTemplate; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.PhysicsMeshQueueItem; import electrosphere.entity.Entity; @@ -69,23 +86,6 @@ import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.creature.ObjectInventoryData; import electrosphere.entity.types.creature.ObjectTemplate; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.collidable.CollidableTemplate; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.creature.type.CreatureData; -import electrosphere.game.data.creature.type.SprintSystem; -import electrosphere.game.data.creature.type.attack.AttackMove; -import electrosphere.game.data.creature.type.movement.EditorMovementSystem; -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.game.data.creature.type.movement.WalkMovementSystem; -import electrosphere.game.data.creature.type.rotator.RotatorConstraint; -import electrosphere.game.data.creature.type.rotator.RotatorItem; -import electrosphere.game.data.creature.type.rotator.RotatorSystem; -import electrosphere.game.data.foliage.type.FoliageType; -import electrosphere.game.data.graphics.GraphicsTemplate; -import electrosphere.game.data.item.Item; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.server.player.Player; diff --git a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java index e50e9b70..f7aa2c6b 100644 --- a/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java +++ b/src/main/java/electrosphere/entity/types/creature/CreatureUtils.java @@ -5,6 +5,9 @@ import java.util.Map.Entry; import org.joml.Quaterniond; import org.joml.Vector3d; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.visualattribute.AttributeVariant; +import electrosphere.data.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; @@ -27,9 +30,6 @@ import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.entity.types.item.ItemUtils; -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.logger.LoggerInterface; import electrosphere.net.NetUtils; import electrosphere.net.parser.net.message.EntityMessage; diff --git a/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java b/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java index 109a0f67..6f951ef5 100644 --- a/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java +++ b/src/main/java/electrosphere/entity/types/creature/ObjectTemplate.java @@ -3,10 +3,10 @@ package electrosphere.entity.types.creature; import java.util.HashMap; import java.util.Map; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.entity.types.EntityTypes.EntityType; -import electrosphere.game.data.creature.type.CreatureData; -import electrosphere.game.data.creature.type.visualattribute.VisualAttribute; import electrosphere.net.synchronization.transport.StateCollection; /** diff --git a/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java b/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java index 2df7798b..68f7b9a4 100644 --- a/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java +++ b/src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java @@ -1,5 +1,7 @@ package electrosphere.entity.types.foliage; +import electrosphere.data.foliage.AmbientAudio; +import electrosphere.data.foliage.FoliageType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; @@ -11,8 +13,6 @@ import electrosphere.entity.state.client.ambientaudio.ClientAmbientAudioTree; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.entity.types.tree.ProceduralTree; -import electrosphere.game.data.foliage.type.AmbientAudio; -import electrosphere.game.data.foliage.type.FoliageType; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.NetworkMessage; import electrosphere.net.server.player.Player; diff --git a/src/main/java/electrosphere/entity/types/item/ItemUtils.java b/src/main/java/electrosphere/entity/types/item/ItemUtils.java index 99cd5ed4..146163f4 100644 --- a/src/main/java/electrosphere/entity/types/item/ItemUtils.java +++ b/src/main/java/electrosphere/entity/types/item/ItemUtils.java @@ -8,6 +8,11 @@ import org.ode4j.ode.DBody; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; +import electrosphere.data.item.EquipData; +import electrosphere.data.item.EquipWhitelist; +import electrosphere.data.item.Item; +import electrosphere.data.item.ItemAudio; +import electrosphere.data.item.WeaponData; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.ClientEntityUtils; @@ -29,11 +34,6 @@ import electrosphere.entity.state.item.ServerChargeState; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.item.EquipData; -import electrosphere.game.data.item.EquipWhitelist; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.item.ItemAudio; -import electrosphere.game.data.item.WeaponData; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.InventoryMessage; diff --git a/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java b/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java index 4ab29b23..93b3f45d 100644 --- a/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java +++ b/src/main/java/electrosphere/entity/types/projectile/ProjectileUtils.java @@ -8,6 +8,8 @@ import org.joml.Vector3d; import org.joml.Vector3f; import electrosphere.collision.hitbox.HitboxUtils.HitboxPositionCallback; +import electrosphere.data.collidable.HitboxData; +import electrosphere.data.projectile.ProjectileType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityCreationUtils; @@ -15,8 +17,6 @@ import electrosphere.entity.EntityUtils; import electrosphere.entity.ServerEntityUtils; import electrosphere.entity.state.hitbox.HitboxCollectionState; import electrosphere.entity.state.movement.ProjectileTree; -import electrosphere.game.data.collidable.HitboxData; -import electrosphere.game.data.projectile.ProjectileType; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.utils.ServerBehaviorTreeUtils; import electrosphere.util.math.SpatialMathUtils; diff --git a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java index 5f0480a9..9819426d 100644 --- a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java +++ b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java @@ -19,6 +19,10 @@ import electrosphere.client.entity.instance.InstancedEntityUtils; import electrosphere.collision.CollisionBodyCreation; import electrosphere.collision.PhysicsEntityUtils; import electrosphere.collision.collidable.Collidable; +import electrosphere.data.foliage.FoliageType; +import electrosphere.data.foliage.ProceduralTreeBranchModel; +import electrosphere.data.foliage.ProceduralTreeTrunkModel; +import electrosphere.data.foliage.TreeModel; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; @@ -27,10 +31,6 @@ import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.btree.BehaviorTree; import electrosphere.entity.state.attach.AttachUtils; -import electrosphere.game.data.foliage.type.FoliageType; -import electrosphere.game.data.foliage.type.ProceduralTreeBranchModel; -import electrosphere.game.data.foliage.type.ProceduralTreeTrunkModel; -import electrosphere.game.data.foliage.type.TreeModel; import electrosphere.renderer.actor.instance.InstancedActor; import electrosphere.renderer.buffer.ShaderAttribute; import electrosphere.renderer.buffer.HomogenousUniformBuffer.HomogenousBufferTypes; diff --git a/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java b/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java index c2e31089..f7f676c1 100644 --- a/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java +++ b/src/main/java/electrosphere/net/client/protocol/EntityProtocol.java @@ -6,6 +6,8 @@ import java.util.List; import org.joml.Quaterniond; import org.joml.Vector3d; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.ViewModelData; import electrosphere.engine.Globals; import electrosphere.entity.ClientEntityUtils; import electrosphere.entity.Entity; @@ -18,8 +20,6 @@ import electrosphere.entity.types.creature.ObjectTemplate; 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.creature.type.ViewModelData; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.EntityMessage; import electrosphere.net.parser.net.message.EntityMessage.EntityMessageType; diff --git a/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java b/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java index 5ababefe..a58d3acf 100644 --- a/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java +++ b/src/main/java/electrosphere/net/server/protocol/CharacterProtocol.java @@ -10,6 +10,8 @@ import com.google.gson.Gson; import electrosphere.client.entity.character.CharacterDescriptionDTO; import electrosphere.client.entity.character.ClientCharacterListDTO; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.visualattribute.VisualAttribute; import electrosphere.engine.Globals; import electrosphere.engine.loadingthreads.LoadingUtils; import electrosphere.entity.Entity; @@ -17,8 +19,6 @@ import electrosphere.entity.EntityUtils; import electrosphere.entity.ServerEntityUtils; 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.VisualAttribute; import electrosphere.net.parser.net.message.CharacterMessage; import electrosphere.net.parser.net.message.PlayerMessage; import electrosphere.net.server.ServerConnectionHandler; diff --git a/src/main/java/electrosphere/net/server/protocol/InventoryProtocol.java b/src/main/java/electrosphere/net/server/protocol/InventoryProtocol.java index ed192306..e64e02a5 100644 --- a/src/main/java/electrosphere/net/server/protocol/InventoryProtocol.java +++ b/src/main/java/electrosphere/net/server/protocol/InventoryProtocol.java @@ -1,9 +1,9 @@ package electrosphere.net.server.protocol; +import electrosphere.data.crafting.RecipeData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; -import electrosphere.game.data.crafting.RecipeData; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.server.ServerConnectionHandler; diff --git a/src/main/java/electrosphere/renderer/actor/Actor.java b/src/main/java/electrosphere/renderer/actor/Actor.java index d56403ce..93739d42 100644 --- a/src/main/java/electrosphere/renderer/actor/Actor.java +++ b/src/main/java/electrosphere/renderer/actor/Actor.java @@ -1,9 +1,9 @@ package electrosphere.renderer.actor; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.bonegroups.BoneGroup; import electrosphere.engine.Globals; import electrosphere.entity.state.AnimationPriorities; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.bonegroups.BoneGroup; import electrosphere.logger.LoggerInterface; import electrosphere.mem.VectorPool; import electrosphere.renderer.OpenGLState; diff --git a/src/main/java/electrosphere/renderer/light/LightManager.java b/src/main/java/electrosphere/renderer/light/LightManager.java index 66a9e380..dc3a5566 100644 --- a/src/main/java/electrosphere/renderer/light/LightManager.java +++ b/src/main/java/electrosphere/renderer/light/LightManager.java @@ -10,10 +10,10 @@ import org.joml.Vector3f; import org.joml.Vector3i; import electrosphere.client.entity.camera.CameraEntityUtils; +import electrosphere.data.common.light.PointLightDescription; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; -import electrosphere.game.data.common.light.PointLightDescription; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.OpenGLState; import electrosphere.renderer.RenderPipelineState; diff --git a/src/main/java/electrosphere/renderer/light/PointLight.java b/src/main/java/electrosphere/renderer/light/PointLight.java index c26b3e44..4c0f1c42 100644 --- a/src/main/java/electrosphere/renderer/light/PointLight.java +++ b/src/main/java/electrosphere/renderer/light/PointLight.java @@ -2,7 +2,7 @@ package electrosphere.renderer.light; import org.joml.Vector3f; -import electrosphere.game.data.common.light.PointLightDescription; +import electrosphere.data.common.light.PointLightDescription; /** * Data about a point light diff --git a/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java b/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java index 58781829..7ad03349 100644 --- a/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java +++ b/src/main/java/electrosphere/renderer/pipelines/debug/DebugContentPipeline.java @@ -14,6 +14,8 @@ import org.ode4j.ode.DSphere; import electrosphere.client.entity.camera.CameraEntityUtils; import electrosphere.collision.PhysicsUtils; import electrosphere.collision.collidable.Collidable; +import electrosphere.data.collidable.CollidableTemplate; +import electrosphere.data.collidable.HitboxData; import electrosphere.engine.Globals; import electrosphere.engine.assetmanager.AssetDataStrings; import electrosphere.entity.Entity; @@ -21,8 +23,6 @@ import electrosphere.entity.EntityDataStrings; import electrosphere.entity.EntityUtils; import electrosphere.entity.state.hitbox.HitboxCollectionState; import electrosphere.entity.state.hitbox.HitboxCollectionState.HitboxState; -import electrosphere.game.data.collidable.CollidableTemplate; -import electrosphere.game.data.collidable.HitboxData; import electrosphere.renderer.OpenGLState; import electrosphere.renderer.RenderPipelineState; import electrosphere.renderer.RenderingEngine; diff --git a/src/main/java/electrosphere/server/ai/AI.java b/src/main/java/electrosphere/server/ai/AI.java index ad9970fe..3f014cbe 100644 --- a/src/main/java/electrosphere/server/ai/AI.java +++ b/src/main/java/electrosphere/server/ai/AI.java @@ -3,14 +3,14 @@ package electrosphere.server.ai; import java.util.LinkedList; import java.util.List; +import electrosphere.data.creature.ai.AITreeData; +import electrosphere.data.creature.ai.AttackerTreeData; +import electrosphere.data.creature.ai.BlockerTreeData; +import electrosphere.data.creature.ai.StandardCharacterTreeData; import electrosphere.entity.Entity; import electrosphere.entity.EntityDataStrings; import electrosphere.entity.state.movement.groundmove.ServerGroundMovementTree; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.creature.type.ai.AITreeData; -import electrosphere.game.data.creature.type.ai.AttackerTreeData; -import electrosphere.game.data.creature.type.ai.BlockerTreeData; -import electrosphere.game.data.creature.type.ai.StandardCharacterTreeData; import electrosphere.logger.LoggerInterface; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/AIManager.java b/src/main/java/electrosphere/server/ai/AIManager.java index 80064c0f..3a60d502 100644 --- a/src/main/java/electrosphere/server/ai/AIManager.java +++ b/src/main/java/electrosphere/server/ai/AIManager.java @@ -6,8 +6,8 @@ import java.util.List; import java.util.Map; import java.util.Random; +import electrosphere.data.creature.ai.AITreeData; import electrosphere.entity.Entity; -import electrosphere.game.data.creature.type.ai.AITreeData; import electrosphere.logger.LoggerInterface; import electrosphere.server.ai.services.NearbyEntityService; import electrosphere.server.ai.services.PathfindingService; diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java index bb3af858..65ecb6ec 100644 --- a/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/actions/combat/MeleeRangeCheckNode.java @@ -2,9 +2,9 @@ package electrosphere.server.ai.nodes.actions.combat; import org.joml.Vector3d; +import electrosphere.data.creature.ai.AttackerTreeData; import electrosphere.entity.Entity; import electrosphere.entity.EntityUtils; -import electrosphere.game.data.creature.type.ai.AttackerTreeData; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java b/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java index 8faff52a..8f310aed 100644 --- a/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/actions/interact/CraftNode.java @@ -1,8 +1,8 @@ package electrosphere.server.ai.nodes.actions.interact; +import electrosphere.data.crafting.RecipeData; +import electrosphere.data.item.source.ItemSourcingData; import electrosphere.entity.Entity; -import electrosphere.game.data.crafting.RecipeData; -import electrosphere.game.data.item.source.ItemSourcingData; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.plan.SolveSourcingTreeNode; diff --git a/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java b/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java index 9e6bac82..9c1d7d1e 100644 --- a/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/checks/inventory/SourcingTypeNode.java @@ -4,10 +4,10 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; +import electrosphere.data.item.source.ItemSourcingData; +import electrosphere.data.item.source.ItemSourcingData.SourcingType; import electrosphere.entity.Entity; import electrosphere.entity.types.common.CommonEntityUtils; -import electrosphere.game.data.item.source.ItemSourcingData; -import electrosphere.game.data.item.source.ItemSourcingData.SourcingType; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.plan.SolveSourcingTreeNode; diff --git a/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java b/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java index 957cbc29..01375aaf 100644 --- a/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java @@ -2,11 +2,11 @@ package electrosphere.server.ai.nodes.checks.spatial; import org.joml.Vector3d; +import electrosphere.data.block.BlockFab; +import electrosphere.data.struct.StructureData; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityUtils; -import electrosphere.game.data.block.BlockFab; -import electrosphere.game.data.struct.StructureData; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java b/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java index ac8ed4d4..3fe01c86 100644 --- a/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/plan/SolveSourcingTreeNode.java @@ -1,8 +1,8 @@ package electrosphere.server.ai.nodes.plan; +import electrosphere.data.item.source.ItemSourcingData; +import electrosphere.data.item.source.ItemSourcingTree; import electrosphere.entity.Entity; -import electrosphere.game.data.item.source.ItemSourcingData; -import electrosphere.game.data.item.source.ItemSourcingTree; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java b/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java index ac344832..515adddb 100644 --- a/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java +++ b/src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java @@ -4,11 +4,11 @@ import org.joml.Vector3d; import org.joml.Vector3i; import electrosphere.client.block.BlockChunkData; +import electrosphere.data.block.BlockFab; +import electrosphere.data.block.BlockType; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; -import electrosphere.game.data.block.BlockFab; -import electrosphere.game.data.block.BlockType; -import electrosphere.game.data.item.Item; import electrosphere.server.ai.blackboard.Blackboard; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; diff --git a/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java b/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java index e8629b0a..bb43e744 100644 --- a/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java +++ b/src/main/java/electrosphere/server/ai/trees/character/StandardCharacterTree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.character; -import electrosphere.game.data.creature.type.ai.StandardCharacterTreeData; +import electrosphere.data.creature.ai.StandardCharacterTreeData; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.meta.collections.SelectorNode; import electrosphere.server.ai.nodes.meta.collections.SequenceNode; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java b/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java index 0b1a6c3f..8b1d3e65 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/AttackerAITree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.creature; -import electrosphere.game.data.creature.type.ai.AttackerTreeData; +import electrosphere.data.creature.ai.AttackerTreeData; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.meta.collections.SequenceNode; import electrosphere.server.ai.trees.creature.melee.MeleeAITree; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java b/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java index 8934ec73..55bb45c1 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/melee/MeleeAITree.java @@ -1,7 +1,7 @@ package electrosphere.server.ai.trees.creature.melee; +import electrosphere.data.creature.ai.AttackerTreeData; import electrosphere.entity.state.movement.groundmove.ClientGroundMovementTree.MovementRelativeFacing; -import electrosphere.game.data.creature.type.ai.AttackerTreeData; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.AITreeNode.AITreeNodeResult; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java b/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java index 52c8aeaa..dc9c5df7 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/resource/AcquireItemTree.java @@ -1,7 +1,7 @@ package electrosphere.server.ai.trees.creature.resource; import electrosphere.collision.CollisionEngine; -import electrosphere.game.data.item.source.ItemSourcingData.SourcingType; +import electrosphere.data.item.source.ItemSourcingData.SourcingType; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.actions.interact.CollectItemNode; diff --git a/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java b/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java index a15281f3..41af6168 100644 --- a/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java +++ b/src/main/java/electrosphere/server/ai/trees/creature/resource/FellTree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.creature.resource; -import electrosphere.game.data.item.ItemIdStrings; +import electrosphere.data.item.ItemIdStrings; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.AITreeNode.AITreeNodeResult; diff --git a/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java b/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java index a537f50b..de278774 100644 --- a/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java +++ b/src/main/java/electrosphere/server/ai/trees/test/BlockerAITree.java @@ -1,6 +1,6 @@ package electrosphere.server.ai.trees.test; -import electrosphere.game.data.creature.type.ai.BlockerTreeData; +import electrosphere.data.creature.ai.BlockerTreeData; import electrosphere.server.ai.blackboard.BlackboardKeys; import electrosphere.server.ai.nodes.AITreeNode; import electrosphere.server.ai.nodes.actions.BlockStartNode; diff --git a/src/main/java/electrosphere/server/entity/ServerContentGenerator.java b/src/main/java/electrosphere/server/entity/ServerContentGenerator.java index d1b32a3a..6fb31636 100644 --- a/src/main/java/electrosphere/server/entity/ServerContentGenerator.java +++ b/src/main/java/electrosphere/server/entity/ServerContentGenerator.java @@ -6,9 +6,9 @@ import java.util.Random; import org.joml.Vector3d; import org.joml.Vector3i; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeFoliageDescription; import electrosphere.entity.types.foliage.FoliageUtils; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeFoliageDescription; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerDataCell; import electrosphere.server.datacell.ServerWorldData; diff --git a/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java b/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java index bb66977a..f8af4a66 100644 --- a/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java +++ b/src/main/java/electrosphere/server/entity/poseactor/PoseActor.java @@ -12,10 +12,10 @@ import org.joml.Quaterniond; import org.joml.Vector3d; import org.joml.Vector4d; +import electrosphere.data.common.treedata.TreeDataAnimation; +import electrosphere.data.creature.bonegroups.BoneGroup; import electrosphere.engine.Globals; import electrosphere.entity.state.AnimationPriorities; -import electrosphere.game.data.common.treedata.TreeDataAnimation; -import electrosphere.game.data.creature.type.bonegroups.BoneGroup; import electrosphere.logger.LoggerInterface; import electrosphere.renderer.actor.ActorAnimationMask; import electrosphere.renderer.actor.ActorBoneRotator; diff --git a/src/main/java/electrosphere/server/entity/unit/UnitUtils.java b/src/main/java/electrosphere/server/entity/unit/UnitUtils.java index bc1d3d05..8a5af7d0 100644 --- a/src/main/java/electrosphere/server/entity/unit/UnitUtils.java +++ b/src/main/java/electrosphere/server/entity/unit/UnitUtils.java @@ -2,6 +2,9 @@ package electrosphere.server.entity.unit; import org.joml.Vector3d; +import electrosphere.data.units.UnitDefinition; +import electrosphere.data.units.UnitEquippedItem; +import electrosphere.data.units.UnitLoader; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.equip.ServerEquipState; @@ -10,9 +13,6 @@ import electrosphere.entity.types.creature.ObjectTemplate; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.units.UnitDefinition; -import electrosphere.game.data.units.UnitEquippedItem; -import electrosphere.game.data.units.UnitLoader; import electrosphere.logger.LoggerInterface; import electrosphere.server.datacell.Realm; diff --git a/src/main/java/electrosphere/server/macro/MacroDataLoader.java b/src/main/java/electrosphere/server/macro/MacroDataLoader.java index 2583abfc..cf418366 100644 --- a/src/main/java/electrosphere/server/macro/MacroDataLoader.java +++ b/src/main/java/electrosphere/server/macro/MacroDataLoader.java @@ -2,7 +2,7 @@ package electrosphere.server.macro; import java.io.File; -import electrosphere.game.data.block.BlockFab; +import electrosphere.data.block.BlockFab; import electrosphere.server.macro.structure.Structure; import electrosphere.util.FileUtils; diff --git a/src/main/java/electrosphere/server/macro/structure/Structure.java b/src/main/java/electrosphere/server/macro/structure/Structure.java index 3d1cc52e..011729ca 100644 --- a/src/main/java/electrosphere/server/macro/structure/Structure.java +++ b/src/main/java/electrosphere/server/macro/structure/Structure.java @@ -3,8 +3,8 @@ package electrosphere.server.macro.structure; import org.joml.AABBd; import org.joml.Vector3d; -import electrosphere.game.data.block.BlockFab; -import electrosphere.game.data.struct.StructureData; +import electrosphere.data.block.BlockFab; +import electrosphere.data.struct.StructureData; import electrosphere.server.macro.MacroData; import electrosphere.server.macro.spatial.MacroAreaObject; import electrosphere.util.annotation.Exclude; diff --git a/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java b/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java index b807b8ad..b30f9702 100644 --- a/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java +++ b/src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java @@ -2,7 +2,7 @@ package electrosphere.server.macro.utils; import org.joml.Vector3d; -import electrosphere.game.data.struct.StructureData; +import electrosphere.data.struct.StructureData; import electrosphere.server.macro.MacroData; /** diff --git a/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java b/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java index 8fa646a3..c54db55b 100644 --- a/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java +++ b/src/main/java/electrosphere/server/macro/utils/StructureRepairUtils.java @@ -4,10 +4,10 @@ import org.joml.Vector3d; import org.joml.Vector3i; import electrosphere.client.block.BlockChunkData; +import electrosphere.data.block.BlockFab; +import electrosphere.data.block.BlockType; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; -import electrosphere.game.data.block.BlockFab; -import electrosphere.game.data.block.BlockType; -import electrosphere.game.data.item.Item; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerWorldData; import electrosphere.server.datacell.gridded.GriddedDataCellManager; diff --git a/src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java b/src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java index 07e29978..2826d964 100644 --- a/src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java +++ b/src/main/java/electrosphere/server/physics/block/editing/ServerBlockEditing.java @@ -10,7 +10,7 @@ import org.joml.Vector4f; import electrosphere.client.block.BlockChunkData; import electrosphere.controls.cursor.CursorState; -import electrosphere.game.data.block.BlockFab; +import electrosphere.data.block.BlockFab; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.interfaces.VoxelCellManager; diff --git a/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java index 13f3c273..5e6aba2b 100644 --- a/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java +++ b/src/main/java/electrosphere/server/physics/terrain/editing/TerrainEditing.java @@ -7,11 +7,11 @@ import java.util.Map.Entry; import org.joml.Vector3d; import org.joml.Vector3i; +import electrosphere.data.item.Item; +import electrosphere.data.voxel.VoxelType; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.voxel.VoxelType; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerWorldData; import electrosphere.server.datacell.interfaces.VoxelCellManager; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java index 7dfdf424..26f69141 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/JSChunkGenerator.java @@ -4,12 +4,12 @@ import java.util.HashMap; import java.util.Map; import electrosphere.client.terrain.cache.ChunkData; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; import org.graalvm.polyglot.Value; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; import electrosphere.server.datacell.ServerWorldData; import electrosphere.server.physics.terrain.generation.heightmap.EmptySkyGen; import electrosphere.server.physics.terrain.generation.heightmap.HeightmapGenerator; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/ProceduralChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/ProceduralChunkGenerator.java index e7c22165..f68a61ca 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/ProceduralChunkGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/ProceduralChunkGenerator.java @@ -4,11 +4,10 @@ import java.util.HashMap; import java.util.Map; import electrosphere.client.terrain.cache.ChunkData; - +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; +import electrosphere.data.voxel.sampler.SamplerFile; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; -import electrosphere.game.data.voxel.sampler.SamplerFile; import electrosphere.server.datacell.ServerWorldData; import electrosphere.server.physics.terrain.generation.heightmap.EmptySkyGen; import electrosphere.server.physics.terrain.generation.heightmap.HeightmapGenerator; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java index 0c4895a1..00c602d2 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/heightmap/HeightmapNoiseGen.java @@ -1,6 +1,6 @@ package electrosphere.server.physics.terrain.generation.heightmap; -import electrosphere.game.data.voxel.sampler.SamplerFile; +import electrosphere.data.voxel.sampler.SamplerFile; import electrosphere.server.physics.terrain.generation.noise.NoiseSampler; /** diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/JSChunkGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/JSChunkGenerator.java index 47c3fbb1..c5fb67db 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/JSChunkGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/interfaces/JSChunkGenerator.java @@ -1,6 +1,6 @@ package electrosphere.server.physics.terrain.generation.interfaces; -import electrosphere.game.data.biome.BiomeData; +import electrosphere.data.biome.BiomeData; /** * A script-defined chunk generator diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java index a174bcb8..1e9b56b0 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/macro/DefaultMacroGenerator.java @@ -3,9 +3,9 @@ package electrosphere.server.physics.terrain.generation.macro; import java.util.List; import java.util.Random; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeTypeMap; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeTypeMap; import electrosphere.server.physics.terrain.models.TerrainModel; /** diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java index 08de5cc4..4c1857c0 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/macro/HomogenousMacroGenerator.java @@ -1,8 +1,8 @@ package electrosphere.server.physics.terrain.generation.macro; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeTypeMap; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeTypeMap; import electrosphere.server.physics.terrain.models.TerrainModel; /** diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java index 37e9bf29..d2488e8f 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/AnimeMountainsGen.java @@ -1,8 +1,8 @@ package electrosphere.server.physics.terrain.generation.voxelphase; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel; import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext; import io.github.studiorailgun.MathUtils; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java index a683c635..b72297da 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/HillsVoxelGen.java @@ -1,8 +1,8 @@ package electrosphere.server.physics.terrain.generation.voxelphase; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel; import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java index 1861498c..a42872c7 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/MountainVoxelGen.java @@ -1,8 +1,8 @@ package electrosphere.server.physics.terrain.generation.voxelphase; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel; import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java index 433b8ab5..74dddf21 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/NoiseVoxelGen.java @@ -1,9 +1,9 @@ package electrosphere.server.physics.terrain.generation.voxelphase; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeFloorElement; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; -import electrosphere.game.data.voxel.sampler.SamplerFile; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeFloorElement; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; +import electrosphere.data.voxel.sampler.SamplerFile; import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel; import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext; import electrosphere.server.physics.terrain.generation.noise.NoiseSampler; diff --git a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java index b36266ac..e01127f1 100644 --- a/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java +++ b/src/main/java/electrosphere/server/physics/terrain/generation/voxelphase/VoxelGenerator.java @@ -1,7 +1,7 @@ package electrosphere.server.physics.terrain.generation.voxelphase; -import electrosphere.game.data.biome.BiomeData; -import electrosphere.game.data.biome.BiomeSurfaceGenerationParams; +import electrosphere.data.biome.BiomeData; +import electrosphere.data.biome.BiomeSurfaceGenerationParams; import electrosphere.server.physics.terrain.generation.interfaces.GeneratedVoxel; import electrosphere.server.physics.terrain.generation.interfaces.GenerationContext; diff --git a/src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java b/src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java index 38cddd2d..f94326b8 100644 --- a/src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java +++ b/src/main/java/electrosphere/server/physics/terrain/models/TerrainModel.java @@ -1,7 +1,7 @@ package electrosphere.server.physics.terrain.models; +import electrosphere.data.biome.BiomeData; import electrosphere.engine.Globals; -import electrosphere.game.data.biome.BiomeData; import electrosphere.server.physics.terrain.generation.ProceduralChunkGenerator; import electrosphere.server.physics.terrain.manager.ServerTerrainChunk; import electrosphere.util.annotation.Exclude; diff --git a/src/main/java/electrosphere/server/player/BlockActions.java b/src/main/java/electrosphere/server/player/BlockActions.java index 9b6efaa3..754a9c9f 100644 --- a/src/main/java/electrosphere/server/player/BlockActions.java +++ b/src/main/java/electrosphere/server/player/BlockActions.java @@ -2,14 +2,14 @@ package electrosphere.server.player; import org.joml.Vector3i; +import electrosphere.data.block.BlockType; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.equip.ServerToolbarState; import electrosphere.entity.state.item.ServerChargeState; import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.block.BlockType; -import electrosphere.game.data.item.Item; import electrosphere.net.server.player.Player; import electrosphere.server.datacell.Realm; import electrosphere.server.datacell.ServerWorldData; diff --git a/src/main/java/electrosphere/server/player/CraftingActions.java b/src/main/java/electrosphere/server/player/CraftingActions.java index 1e0a31e5..e3bd9f08 100644 --- a/src/main/java/electrosphere/server/player/CraftingActions.java +++ b/src/main/java/electrosphere/server/player/CraftingActions.java @@ -5,16 +5,16 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import electrosphere.data.crafting.RecipeData; +import electrosphere.data.crafting.RecipeIngredientData; +import electrosphere.data.item.Item; +import electrosphere.data.item.ItemDataMap; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.inventory.InventoryUtils; import electrosphere.entity.state.inventory.RelationalInventoryState; import electrosphere.entity.state.inventory.UnrelationalInventoryState; import electrosphere.entity.state.item.ServerChargeState; -import electrosphere.game.data.crafting.RecipeData; -import electrosphere.game.data.crafting.RecipeIngredientData; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.item.ItemDataMap; /** * Actions around crafting diff --git a/src/main/java/electrosphere/server/player/PlayerActions.java b/src/main/java/electrosphere/server/player/PlayerActions.java index 3f70c56f..b755d116 100644 --- a/src/main/java/electrosphere/server/player/PlayerActions.java +++ b/src/main/java/electrosphere/server/player/PlayerActions.java @@ -4,6 +4,11 @@ import org.joml.Vector3d; import org.joml.Vector3i; import electrosphere.client.interact.ItemActions; +import electrosphere.data.common.interact.InteractionData; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.block.BlockVariant; +import electrosphere.data.item.Item; +import electrosphere.data.item.ItemUsage; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.state.block.ServerBlockTree; @@ -13,11 +18,6 @@ import electrosphere.entity.state.item.ServerChargeState; import electrosphere.entity.state.life.ServerLifeTree; import electrosphere.entity.types.common.CommonEntityUtils; import electrosphere.entity.types.creature.CreatureUtils; -import electrosphere.game.data.common.interact.InteractionData; -import electrosphere.game.data.creature.type.CreatureData; -import electrosphere.game.data.creature.type.block.BlockVariant; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.item.ItemUsage; import electrosphere.logger.LoggerInterface; import electrosphere.net.parser.net.message.InventoryMessage; import electrosphere.net.server.ServerConnectionHandler; diff --git a/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java b/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java index 9edfd730..27696c4c 100644 --- a/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java +++ b/src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java @@ -2,9 +2,9 @@ package electrosphere.server.simulation.chara; import org.joml.Vector3d; +import electrosphere.data.block.BlockFab; +import electrosphere.data.struct.StructureData; import electrosphere.engine.Globals; -import electrosphere.game.data.block.BlockFab; -import electrosphere.game.data.struct.StructureData; import electrosphere.server.datacell.Realm; import electrosphere.server.macro.MacroData; import electrosphere.server.macro.character.Character; diff --git a/src/main/java/electrosphere/util/FileUtils.java b/src/main/java/electrosphere/util/FileUtils.java index c779e75e..684fc2f7 100644 --- a/src/main/java/electrosphere/util/FileUtils.java +++ b/src/main/java/electrosphere/util/FileUtils.java @@ -3,10 +3,10 @@ package electrosphere.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import electrosphere.game.data.creature.type.ai.AITreeData; -import electrosphere.game.data.creature.type.ai.AITreeDataSerializer; -import electrosphere.game.data.creature.type.movement.MovementSystem; -import electrosphere.game.data.creature.type.movement.MovementSystemSerializer; +import electrosphere.data.creature.ai.AITreeData; +import electrosphere.data.creature.ai.AITreeDataSerializer; +import electrosphere.data.creature.movement.MovementSystem; +import electrosphere.data.creature.movement.MovementSystemSerializer; import electrosphere.logger.LoggerInterface; import electrosphere.server.macro.character.data.CharacterData; import electrosphere.server.macro.character.data.CharacterDataSerializer; diff --git a/src/main/java/electrosphere/util/SerializationUtils.java b/src/main/java/electrosphere/util/SerializationUtils.java index d0491893..be255278 100644 --- a/src/main/java/electrosphere/util/SerializationUtils.java +++ b/src/main/java/electrosphere/util/SerializationUtils.java @@ -3,10 +3,10 @@ package electrosphere.util; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import electrosphere.game.data.creature.type.ai.AITreeData; -import electrosphere.game.data.creature.type.ai.AITreeDataSerializer; -import electrosphere.game.data.creature.type.movement.MovementSystem; -import electrosphere.game.data.creature.type.movement.MovementSystemSerializer; +import electrosphere.data.creature.ai.AITreeData; +import electrosphere.data.creature.ai.AITreeDataSerializer; +import electrosphere.data.creature.movement.MovementSystem; +import electrosphere.data.creature.movement.MovementSystemSerializer; import electrosphere.server.macro.character.data.CharacterData; import electrosphere.server.macro.character.data.CharacterDataSerializer; import electrosphere.server.physics.terrain.generation.noise.NoiseModuleSerializer; diff --git a/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java b/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java index be62fc5a..6c81b9ca 100644 --- a/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java +++ b/src/test/java/electrosphere/entity/SpawnAllEntitiesTests.java @@ -5,6 +5,14 @@ import static org.junit.jupiter.api.Assertions.*; import org.joml.Vector3d; import org.junit.jupiter.api.Disabled; +import electrosphere.data.common.CommonEntityMap; +import electrosphere.data.common.CommonEntityType; +import electrosphere.data.creature.CreatureData; +import electrosphere.data.creature.CreatureTypeLoader; +import electrosphere.data.foliage.FoliageType; +import electrosphere.data.foliage.FoliageTypeLoader; +import electrosphere.data.item.Item; +import electrosphere.data.item.ItemDataMap; import electrosphere.engine.Globals; import electrosphere.entity.types.EntityTypes.EntityType; import electrosphere.entity.types.common.CommonEntityUtils; @@ -12,14 +20,6 @@ import electrosphere.entity.types.creature.ObjectTemplate; import electrosphere.entity.types.creature.CreatureUtils; import electrosphere.entity.types.foliage.FoliageUtils; import electrosphere.entity.types.item.ItemUtils; -import electrosphere.game.data.common.CommonEntityMap; -import electrosphere.game.data.common.CommonEntityType; -import electrosphere.game.data.creature.type.CreatureData; -import electrosphere.game.data.creature.type.CreatureTypeLoader; -import electrosphere.game.data.foliage.type.FoliageType; -import electrosphere.game.data.foliage.type.FoliageTypeLoader; -import electrosphere.game.data.item.Item; -import electrosphere.game.data.item.ItemDataMap; import electrosphere.test.annotations.IntegrationTest; import electrosphere.test.template.EntityTestTemplate; import electrosphere.test.testutils.TestEngineUtils; diff --git a/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java b/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java index 0ba863c2..7c2bc355 100644 --- a/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java +++ b/src/test/java/electrosphere/entity/types/item/ItemUtilsTests.java @@ -8,12 +8,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; import electrosphere.collision.PhysicsEntityUtils; +import electrosphere.data.item.Item; import electrosphere.engine.Globals; import electrosphere.entity.Entity; import electrosphere.entity.EntityTags; import electrosphere.entity.state.inventory.InventoryUtils; import electrosphere.entity.state.inventory.UnrelationalInventoryState; -import electrosphere.game.data.item.Item; import electrosphere.test.annotations.IntegrationTest; import electrosphere.test.template.EntityTestTemplate; import electrosphere.test.testutils.TestEngineUtils;