refactor fabs

src/main/java/electrosphere/client/ClientState.java

@@ -5,7 +5,6 @@ import java.util.ArrayList;
 import org.joml.Vector3f;
 
 import electrosphere.client.block.ClientBlockManager;
-import electrosphere.client.block.StructureData;
 import electrosphere.client.block.cells.ClientBlockCellManager;
 import electrosphere.client.chemistry.ClientChemistryCollisionCallback;
 import electrosphere.client.entity.character.ClientCharacterManager;
@@ -20,6 +19,7 @@ import electrosphere.client.terrain.cells.ClientDrawCellManager;
 import electrosphere.client.terrain.foliage.FoliageCellManager;
 import electrosphere.client.terrain.manager.ClientTerrainManager;
 import electrosphere.collision.CollisionEngine;
+import electrosphere.data.block.fab.StructureData;
 import electrosphere.data.common.CommonEntityType;
 import electrosphere.data.voxel.VoxelType;
 import electrosphere.entity.Entity;

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

@@ -11,7 +11,7 @@ import org.joml.Vector3i;
 import electrosphere.client.interact.select.AreaSelection;
 import electrosphere.client.interact.select.AreaSelection.AreaSelectionType;
 import electrosphere.client.scene.ClientWorldData;
-import electrosphere.data.block.BlockFab;
+import electrosphere.data.block.fab.BlockFab;
 import electrosphere.engine.Globals;
 import electrosphere.util.math.HashUtils;
 

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

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

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

@@ -5,10 +5,10 @@ import java.io.File;
 import org.joml.Vector3d;
 
 import electrosphere.client.block.ClientBlockSelection;
-import electrosphere.client.block.StructureData;
 import electrosphere.client.interact.select.AreaSelection;
-import electrosphere.data.block.BlockFab;
-import electrosphere.data.block.BlockFabMetadata;
+import electrosphere.data.block.fab.BlockFab;
+import electrosphere.data.block.fab.BlockFabMetadata;
+import electrosphere.data.block.fab.StructureData;
 import electrosphere.engine.Globals;
 import imgui.ImGui;
 

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

@@ -6,7 +6,7 @@ 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.data.block.fab.BlockFab;
 import electrosphere.engine.Globals;
 import electrosphere.engine.signal.Signal.SignalType;
 import electrosphere.renderer.ui.elements.Window;

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

@@ -9,7 +9,7 @@ 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.block.fab.BlockFab;
 import electrosphere.data.grident.GridAlignedData;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;

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

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

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

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

src/main/java/electrosphere/data/block/fab/StructureData.java

@@ -1,4 +1,4 @@
-package electrosphere.client.block;
+package electrosphere.data.block.fab;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -6,6 +6,8 @@ import java.util.List;
 import org.joml.Vector3d;
 import org.joml.Vector3i;
 
+import electrosphere.client.block.BlockChunkData;
+import electrosphere.client.block.ClientBlockSelection;
 import electrosphere.client.interact.select.AreaSelection;
 import electrosphere.client.interact.select.AreaSelection.AreaSelectionType;
 import electrosphere.client.scene.ClientWorldData;

src/main/java/electrosphere/entity/state/equip/ClientToolbarState.java

@@ -15,7 +15,7 @@ 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.block.fab.BlockFab;
 import electrosphere.data.common.treedata.TreeDataAnimation;
 import electrosphere.data.creature.equip.EquipPoint;
 import electrosphere.data.creature.equip.ToolbarData;

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

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

src/main/java/electrosphere/server/ai/nodes/solvers/SolveBuildMaterialNode.java

@@ -4,8 +4,8 @@ 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.block.fab.BlockFab;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.entity.Entity;

src/main/java/electrosphere/server/macro/MacroDataLoader.java

@@ -2,7 +2,7 @@ package electrosphere.server.macro;
 
 import java.io.File;
 
-import electrosphere.data.block.BlockFab;
+import electrosphere.data.block.fab.BlockFab;
 import electrosphere.server.macro.structure.Structure;
 import electrosphere.util.FileUtils;
 

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

@@ -3,7 +3,7 @@ package electrosphere.server.macro.structure;
 import org.joml.AABBd;
 import org.joml.Vector3d;
 
-import electrosphere.data.block.BlockFab;
+import electrosphere.data.block.fab.BlockFab;
 import electrosphere.data.struct.StructureData;
 import electrosphere.server.macro.MacroData;
 import electrosphere.server.macro.spatial.MacroAreaObject;

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

@@ -4,8 +4,8 @@ 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.block.fab.BlockFab;
 import electrosphere.data.item.Item;
 import electrosphere.engine.Globals;
 import electrosphere.server.datacell.Realm;

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.data.block.BlockFab;
+import electrosphere.data.block.fab.BlockFab;
 import electrosphere.server.datacell.Realm;
 import electrosphere.server.datacell.interfaces.VoxelCellManager;
 

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

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