separate main & test

src/buildings/production/Assembler.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Assembler extends Building {
-}

src/buildings/production/Constructor.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Constructor extends Building {
-}

src/buildings/production/CraftBench.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class CraftBench extends Building {
-}

src/buildings/production/EquipmentWorkshop.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class EquipmentWorkshop extends Building {
-}

src/buildings/production/Foundry.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Foundry extends Building {
-}

src/buildings/production/Manufacturer.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Manufacturer extends Building {
-}

src/buildings/production/Miner.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Miner extends Building {
-}

src/buildings/production/OilExtractor.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class OilExtractor extends Building {
-}

src/buildings/production/Packager.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Packager extends Building {
-}

src/buildings/production/Refinery.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Refinery extends Building {
-}

src/buildings/production/Smelter.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class Smelter extends Building {
-}

src/buildings/production/WaterExtractor.java

@@ -1,6 +0,0 @@
-package buildings.production;
-
-import buildings.Building;
-
-public class WaterExtractor extends Building {
-}

src/main/satisfactory/Database.java

@@ -1,6 +1,8 @@
-package items;
+package satisfactory;
 
-import items.type.*;
+import satisfactory.items.Item;
+import satisfactory.items.Recipe;
+import satisfactory.items.type.*;
 
 import java.util.*;
 

src/main/satisfactory/Test.java

@@ -1,7 +1,9 @@
+package satisfactory;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import items.*;
+import satisfactory.items.*;
 import org.jgrapht.Graph;
 import org.jgrapht.graph.DefaultWeightedEdge;
 import org.jgrapht.graph.EdgeReversedGraph;
@@ -13,11 +15,11 @@ import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
 
-import static items.Utils.plot2;
+import static satisfactory.Utils.plot2;
 
 public class Test {
     public static void main(String[] args) throws JsonProcessingException {
-        //System.out.println(items.Database.AdaptiveControlUnit);
+        //System.out.println(satisfactory.items.Database.AdaptiveControlUnit);
         Map<Item, Integer> totalRequirements = Database.HeavyModularFrame.getRecipe().getTotalRequirements();
         System.out.println(totalRequirements);
 

src/main/satisfactory/Utils.java

@@ -1,6 +1,5 @@
-package items;
+package satisfactory;
 
-import items.type.Ore;
 import org.jgrapht.Graph;
 import org.jgrapht.event.ConnectedComponentTraversalEvent;
 import org.jgrapht.event.EdgeTraversalEvent;
@@ -14,6 +13,8 @@ import org.jgrapht.nio.DefaultAttribute;
 import org.jgrapht.nio.dot.DOTExporter;
 import org.jgrapht.traverse.DepthFirstIterator;
 import org.jgrapht.traverse.GraphIterator;
+import satisfactory.items.Item;
+import satisfactory.items.ProductionEdge;
 
 import java.io.File;
 import java.util.HashMap;

src/main/satisfactory/buildings/Building.java

@@ -1,4 +1,4 @@
-package buildings;
+package satisfactory.buildings;
 
 public abstract class Building {
 }

src/main/satisfactory/buildings/production/Assembler.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Assembler extends Building {
+}

src/main/satisfactory/buildings/production/Constructor.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Constructor extends Building {
+}

src/main/satisfactory/buildings/production/CraftBench.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class CraftBench extends Building {
+}

src/main/satisfactory/buildings/production/EquipmentWorkshop.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class EquipmentWorkshop extends Building {
+}

src/main/satisfactory/buildings/production/Foundry.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Foundry extends Building {
+}

src/main/satisfactory/buildings/production/Manufacturer.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Manufacturer extends Building {
+}

src/main/satisfactory/buildings/production/Miner.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Miner extends Building {
+}

src/main/satisfactory/buildings/production/OilExtractor.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class OilExtractor extends Building {
+}

src/main/satisfactory/buildings/production/Packager.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Packager extends Building {
+}

src/main/satisfactory/buildings/production/Refinery.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Refinery extends Building {
+}

src/main/satisfactory/buildings/production/Smelter.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class Smelter extends Building {
+}

src/main/satisfactory/buildings/production/WaterExtractor.java

@@ -0,0 +1,6 @@
+package satisfactory.buildings.production;
+
+import satisfactory.buildings.Building;
+
+public class WaterExtractor extends Building {
+}

src/main/satisfactory/items/Item.java

@@ -1,7 +1,8 @@
-package items;
+package satisfactory.items;
 
 import org.jgrapht.Graph;
 import org.jgrapht.graph.DefaultWeightedEdge;
+import satisfactory.Database;
 
 import java.util.*;
 

src/main/satisfactory/items/ProductionEdge.java

@@ -1,4 +1,4 @@
-package items;
+package satisfactory.items;
 
 import java.util.Objects;
 

src/main/satisfactory/items/Recipe.java

@@ -1,7 +1,7 @@
-package items;
+package satisfactory.items;
 
-import items.requirements.RateAccumulator;
+import satisfactory.items.requirements.RateAccumulator;
-import items.requirements.TotalAccumulator;
+import satisfactory.items.requirements.TotalAccumulator;
 import org.jgrapht.Graph;
 import org.jgrapht.Graphs;
 import org.jgrapht.graph.DefaultDirectedWeightedGraph;
@@ -191,7 +191,7 @@ public class Recipe {
         production.addEdge(target, target, new ProductionEdge(target, prodPerMinute, processesNeeded(target, prodPerMinute)));
         while (!queue.isEmpty()) {
             Item item = queue.remove();
-            // next items
+            // next satisfactory.items
             buildGraph.incomingEdgesOf(item)
                     .stream()
                     .map(buildGraph::getEdgeSource)

src/main/satisfactory/items/requirements/Accumulator.java

@@ -1,7 +1,7 @@
-package items.requirements;
+package satisfactory.items.requirements;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/satisfactory/items/requirements/RateAccumulator.java

@@ -1,7 +1,7 @@
-package items.requirements;
+package satisfactory.items.requirements;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/satisfactory/items/requirements/RequirementAccumulator.java

@@ -1,6 +1,6 @@
-package items.requirements;
+package satisfactory.items.requirements;
 
-import items.Item;
+import satisfactory.items.Item;
 
 import java.util.Map;
 

src/main/satisfactory/items/requirements/TotalAccumulator.java

@@ -1,7 +1,7 @@
-package items.requirements;
+package satisfactory.items.requirements;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 import java.util.Map;
 

src/main/satisfactory/items/type/Fluid.java

@@ -1,7 +1,7 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public abstract class Fluid extends Item {
 

src/main/satisfactory/items/type/Ingot.java

@@ -1,7 +1,7 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class Ingot extends Item {
 

src/main/satisfactory/items/type/Ore.java

@@ -1,7 +1,7 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class Ore extends Item {
 

src/main/satisfactory/items/type/Part.java

@@ -1,7 +1,7 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class Part extends Item {
 

src/main/satisfactory/items/type/Pickup.java

@@ -1,7 +1,7 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class Pickup extends Item {
 

src/main/satisfactory/items/type/ProcessedFluid.java

@@ -1,6 +1,6 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class ProcessedFluid extends Fluid {
 

src/main/satisfactory/items/type/RawFluid.java

@@ -1,6 +1,6 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class RawFluid extends Fluid {
 

src/main/satisfactory/items/type/Tool.java

@@ -1,7 +1,7 @@
-package items.type;
+package satisfactory.items.type;
 
-import items.Item;
+import satisfactory.items.Item;
-import items.Recipe;
+import satisfactory.items.Recipe;
 
 public class Tool extends Item {
 

src/test/satisfactory/items/ItemTest.java

@@ -1,4 +1,4 @@
-package items;
+package satisfactory.items;
 
 import org.junit.jupiter.api.Test;
 
@@ -7,6 +7,8 @@ import java.util.Map;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import satisfactory.Database;
+
 class ItemTest {
 
     @Test