moving data packages around

docs/src/progress/renderertodo.md

@@ -2025,6 +2025,7 @@ Fix server collision resolution never triggering for second body
 Fix macro structure rotation generation
 Improvement to building placement math in TownLayout
 Scaffold character job data
+Moving data packages around
 
 
 

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

@@ -11,7 +11,7 @@ import electrosphere.data.entity.common.CommonEntityType;
 import electrosphere.data.entity.creature.CreatureData;
 import electrosphere.data.entity.foliage.FoliageType;
 import electrosphere.data.entity.item.Item;
-import electrosphere.data.units.UnitDefinition;
+import electrosphere.data.macro.units.UnitDefinition;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.entity.Entity;

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

@@ -20,11 +20,11 @@ import electrosphere.data.entity.foliage.FoliageTypeMap;
 import electrosphere.data.entity.item.ItemDataMap;
 import electrosphere.data.entity.item.source.ItemSourcingMap;
 import electrosphere.data.entity.projectile.ProjectileTypeHolder;
+import electrosphere.data.macro.struct.StructureDataLoader;
+import electrosphere.data.macro.units.UnitDefinitionFile;
+import electrosphere.data.macro.units.UnitLoader;
 import electrosphere.data.settings.UserSettings;
-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.logger.LoggerInterface;

src/main/java/electrosphere/data/macro/job/CharaJob.java

@@ -1,4 +1,4 @@
-package electrosphere.data.macro;
+package electrosphere.data.macro.job;
 
 /**
  * A job that a character can have

src/main/java/electrosphere/data/macro/struct/StructureData.java

@@ -1,4 +1,4 @@
-package electrosphere.data.struct;
+package electrosphere.data.macro.struct;
 
 import org.joml.Vector3d;
 

src/main/java/electrosphere/data/macro/struct/StructureDataFile.java

@@ -1,4 +1,4 @@
-package electrosphere.data.struct;
+package electrosphere.data.macro.struct;
 
 import java.util.List;
 

src/main/java/electrosphere/data/macro/struct/StructureDataLoader.java

@@ -1,4 +1,4 @@
-package electrosphere.data.struct;
+package electrosphere.data.macro.struct;
 
 import java.io.File;
 import java.util.Collection;

src/main/java/electrosphere/data/macro/units/UnitDefinition.java

@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 import java.util.List;
 

src/main/java/electrosphere/data/macro/units/UnitDefinitionFile.java

@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 import java.util.List;
 

src/main/java/electrosphere/data/macro/units/UnitEquippedItem.java

@@ -1,4 +1,4 @@
-package electrosphere.data.units;
+package electrosphere.data.macro.units;
 
 /**
  * An item equipped to a unit

src/main/java/electrosphere/data/macro/units/UnitLoader.java

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

src/main/java/electrosphere/server/ai/nodes/checks/spatial/BeginStructureNode.java

@@ -3,7 +3,7 @@ package electrosphere.server.ai.nodes.checks.spatial;
 import org.joml.Vector3d;
 
 import electrosphere.data.block.fab.BlockFab;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.EntityUtils;

src/main/java/electrosphere/server/entity/unit/UnitUtils.java

@@ -2,9 +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.data.macro.units.UnitDefinition;
+import electrosphere.data.macro.units.UnitEquippedItem;
+import electrosphere.data.macro.units.UnitLoader;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;
 import electrosphere.entity.state.inventory.ServerInventoryState;

src/main/java/electrosphere/server/macro/structure/VirtualStructure.java

@@ -6,7 +6,7 @@ import org.joml.Vector3d;
 
 import electrosphere.controls.cursor.CursorState;
 import electrosphere.data.block.fab.BlockFab;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.server.datacell.ServerWorldData;
 import electrosphere.server.macro.MacroData;
 import electrosphere.server.macro.spatial.MacroAreaObject;

src/main/java/electrosphere/server/macro/town/TownLayout.java

@@ -10,7 +10,7 @@ import org.joml.Vector3d;
 import org.joml.Vector3i;
 
 import electrosphere.controls.cursor.CursorState;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.engine.Globals;
 import electrosphere.logger.LoggerInterface;
 import electrosphere.server.datacell.Realm;

src/main/java/electrosphere/server/macro/utils/StructurePlacementUtils.java

@@ -2,7 +2,7 @@ package electrosphere.server.macro.utils;
 
 import org.joml.Vector3d;
 
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.server.macro.MacroData;
 
 /**

src/main/java/electrosphere/server/simulation/chara/CharaSimulation.java

@@ -3,7 +3,7 @@ package electrosphere.server.simulation.chara;
 import org.joml.Vector3d;
 
 import electrosphere.data.block.fab.BlockFab;
-import electrosphere.data.struct.StructureData;
+import electrosphere.data.macro.struct.StructureData;
 import electrosphere.engine.Globals;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.macro.MacroData;