macro class refactoring

docs/src/progress/renderertodo.md

@@ -1509,6 +1509,7 @@ Terrain editing/saving work
 Refactoring server classes under physics package
 Refactoring server classes under entity package
 Refactoring server macro data classes
+Refactoring some macro classes
 
 
 

src/main/java/electrosphere/engine/Globals.java

@@ -83,7 +83,7 @@ import electrosphere.server.datacell.RealmManager;
 import electrosphere.server.db.DatabaseController;
 import electrosphere.server.entity.poseactor.PoseModel;
 import electrosphere.server.macro.MacroData;
-import electrosphere.server.macro.structure.virtual.StructureManager;
+import electrosphere.server.macro.structure.StructureManager;
 import electrosphere.server.pathfinding.NavMeshManager;
 import electrosphere.server.saves.Save;
 import electrosphere.server.simulation.MacroSimulation;

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

@@ -24,8 +24,8 @@ 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.server.macro.race.model.RaceMap;
-import electrosphere.server.macro.symbolism.model.SymbolMap;
+import electrosphere.server.macro.race.RaceMap;
+import electrosphere.server.macro.symbolism.SymbolMap;
 import electrosphere.util.FileUtils;
 
 /**

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

@@ -10,10 +10,10 @@ import electrosphere.server.macro.character.CharacterDataStrings;
 import electrosphere.server.macro.character.CharacterUtils;
 import electrosphere.server.macro.character.diety.Diety;
 import electrosphere.server.macro.civilization.Civilization;
-import electrosphere.server.macro.race.model.Race;
-import electrosphere.server.macro.race.model.RaceMap;
-import electrosphere.server.macro.structure.virtual.Structure;
-import electrosphere.server.macro.symbolism.model.Symbol;
+import electrosphere.server.macro.race.Race;
+import electrosphere.server.macro.race.RaceMap;
+import electrosphere.server.macro.structure.Structure;
+import electrosphere.server.macro.symbolism.Symbol;
 import electrosphere.server.macro.town.Town;
 
 import java.util.Random;

src/main/java/electrosphere/server/macro/character/CharacterUtils.java

@@ -1,8 +1,8 @@
 package electrosphere.server.macro.character;
 
 import electrosphere.server.macro.character.diety.Diety;
-import electrosphere.server.macro.race.model.Race;
-import electrosphere.server.macro.structure.virtual.Structure;
+import electrosphere.server.macro.race.Race;
+import electrosphere.server.macro.structure.Structure;
 import electrosphere.server.macro.town.Town;
 
 import org.joml.Vector2i;

src/main/java/electrosphere/server/macro/character/diety/Diety.java

@@ -1,8 +1,8 @@
 package electrosphere.server.macro.character.diety;
 
 import electrosphere.engine.Globals;
-import electrosphere.server.macro.symbolism.model.Symbol;
-import electrosphere.server.macro.symbolism.model.SymbolMap;
+import electrosphere.server.macro.symbolism.Symbol;
+import electrosphere.server.macro.symbolism.SymbolMap;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/macro/race/Race.java

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.race.model;
+package electrosphere.server.macro.race;
 
 /**
  * The race of a creature

src/main/java/electrosphere/server/macro/race/RaceMap.java

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.race.model;
+package electrosphere.server.macro.race;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.structure.virtual;
+package electrosphere.server.macro.structure;
 
 import java.util.HashMap;
 import java.util.LinkedList;

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

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.structure.virtual;
+package electrosphere.server.macro.structure;
 
 /**
  *

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

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.structure.virtual;
+package electrosphere.server.macro.structure;
 
 import com.google.gson.Gson;
 

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

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.structure.virtual;
+package electrosphere.server.macro.structure;
 
 import electrosphere.engine.Globals;
 import electrosphere.server.datacell.Realm;

src/main/java/electrosphere/server/macro/symbolism/Symbol.java

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.symbolism.model;
+package electrosphere.server.macro.symbolism;
 
 import java.util.List;
 

src/main/java/electrosphere/server/macro/symbolism/SymbolMap.java

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.symbolism.model;
+package electrosphere.server.macro.symbolism;
 
 import java.util.List;
 

src/main/java/electrosphere/server/macro/symbolism/SymbolismRelation.java

@@ -1,4 +1,4 @@
-package electrosphere.server.macro.symbolism.model;
+package electrosphere.server.macro.symbolism;
 
 public class SymbolismRelation {
     String name;

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

@@ -2,7 +2,7 @@ package electrosphere.server.macro.town;
 
 import electrosphere.engine.Globals;
 import electrosphere.server.macro.character.Character;
-import electrosphere.server.macro.structure.virtual.Structure;
+import electrosphere.server.macro.structure.Structure;
 
 import java.util.LinkedList;
 import java.util.List;

src/main/java/electrosphere/server/simulation/MacroSimulation.java

@@ -4,9 +4,9 @@ import electrosphere.engine.Globals;
 import electrosphere.server.macro.character.Character;
 import electrosphere.server.macro.character.CharacterDataStrings;
 import electrosphere.server.macro.character.CharacterUtils;
-import electrosphere.server.macro.structure.virtual.Structure;
-import electrosphere.server.macro.structure.virtual.StructureDataStrings;
-import electrosphere.server.macro.structure.virtual.VirtualStructureUtils;
+import electrosphere.server.macro.structure.Structure;
+import electrosphere.server.macro.structure.StructureDataStrings;
+import electrosphere.server.macro.structure.VirtualStructureUtils;
 import electrosphere.server.macro.town.Town;
 
 import java.util.LinkedList;