From e1f442308e5705b10a3ab2fd3905a60095df9541 Mon Sep 17 00:00:00 2001 From: agp8x Date: Mon, 10 May 2021 21:41:10 +0200 Subject: [PATCH] separate main & test --- src/buildings/production/Assembler.java | 6 ------ src/buildings/production/Constructor.java | 6 ------ src/buildings/production/CraftBench.java | 6 ------ src/buildings/production/EquipmentWorkshop.java | 6 ------ src/buildings/production/Foundry.java | 6 ------ src/buildings/production/Manufacturer.java | 6 ------ src/buildings/production/Miner.java | 6 ------ src/buildings/production/OilExtractor.java | 6 ------ src/buildings/production/Packager.java | 6 ------ src/buildings/production/Refinery.java | 6 ------ src/buildings/production/Smelter.java | 6 ------ src/buildings/production/WaterExtractor.java | 6 ------ src/{items => main/satisfactory}/Database.java | 6 ++++-- src/{ => main/satisfactory}/Test.java | 8 +++++--- src/{items => main/satisfactory}/Utils.java | 5 +++-- src/{ => main/satisfactory}/buildings/Building.java | 2 +- src/main/satisfactory/buildings/production/Assembler.java | 6 ++++++ .../satisfactory/buildings/production/Constructor.java | 6 ++++++ .../satisfactory/buildings/production/CraftBench.java | 6 ++++++ .../buildings/production/EquipmentWorkshop.java | 6 ++++++ src/main/satisfactory/buildings/production/Foundry.java | 6 ++++++ .../satisfactory/buildings/production/Manufacturer.java | 6 ++++++ src/main/satisfactory/buildings/production/Miner.java | 6 ++++++ .../satisfactory/buildings/production/OilExtractor.java | 6 ++++++ src/main/satisfactory/buildings/production/Packager.java | 6 ++++++ src/main/satisfactory/buildings/production/Refinery.java | 6 ++++++ src/main/satisfactory/buildings/production/Smelter.java | 6 ++++++ .../satisfactory/buildings/production/WaterExtractor.java | 6 ++++++ src/{ => main/satisfactory}/items/Item.java | 3 ++- src/{ => main/satisfactory}/items/ProductionEdge.java | 2 +- src/{ => main/satisfactory}/items/Recipe.java | 8 ++++---- .../satisfactory}/items/requirements/Accumulator.java | 6 +++--- .../satisfactory}/items/requirements/RateAccumulator.java | 6 +++--- .../items/requirements/RequirementAccumulator.java | 4 ++-- .../items/requirements/TotalAccumulator.java | 6 +++--- src/{ => main/satisfactory}/items/type/Fluid.java | 6 +++--- src/{ => main/satisfactory}/items/type/Ingot.java | 6 +++--- src/{ => main/satisfactory}/items/type/Ore.java | 6 +++--- src/{ => main/satisfactory}/items/type/Part.java | 6 +++--- src/{ => main/satisfactory}/items/type/Pickup.java | 6 +++--- .../satisfactory}/items/type/ProcessedFluid.java | 4 ++-- src/{ => main/satisfactory}/items/type/RawFluid.java | 4 ++-- src/{ => main/satisfactory}/items/type/Tool.java | 6 +++--- src/test/{java => satisfactory}/items/ItemTest.java | 4 +++- 44 files changed, 128 insertions(+), 120 deletions(-) delete mode 100644 src/buildings/production/Assembler.java delete mode 100644 src/buildings/production/Constructor.java delete mode 100644 src/buildings/production/CraftBench.java delete mode 100644 src/buildings/production/EquipmentWorkshop.java delete mode 100644 src/buildings/production/Foundry.java delete mode 100644 src/buildings/production/Manufacturer.java delete mode 100644 src/buildings/production/Miner.java delete mode 100644 src/buildings/production/OilExtractor.java delete mode 100644 src/buildings/production/Packager.java delete mode 100644 src/buildings/production/Refinery.java delete mode 100644 src/buildings/production/Smelter.java delete mode 100644 src/buildings/production/WaterExtractor.java rename src/{items => main/satisfactory}/Database.java (99%) rename src/{ => main/satisfactory}/Test.java (96%) rename src/{items => main/satisfactory}/Utils.java (98%) rename src/{ => main/satisfactory}/buildings/Building.java (52%) create mode 100644 src/main/satisfactory/buildings/production/Assembler.java create mode 100644 src/main/satisfactory/buildings/production/Constructor.java create mode 100644 src/main/satisfactory/buildings/production/CraftBench.java create mode 100644 src/main/satisfactory/buildings/production/EquipmentWorkshop.java create mode 100644 src/main/satisfactory/buildings/production/Foundry.java create mode 100644 src/main/satisfactory/buildings/production/Manufacturer.java create mode 100644 src/main/satisfactory/buildings/production/Miner.java create mode 100644 src/main/satisfactory/buildings/production/OilExtractor.java create mode 100644 src/main/satisfactory/buildings/production/Packager.java create mode 100644 src/main/satisfactory/buildings/production/Refinery.java create mode 100644 src/main/satisfactory/buildings/production/Smelter.java create mode 100644 src/main/satisfactory/buildings/production/WaterExtractor.java rename src/{ => main/satisfactory}/items/Item.java (98%) rename src/{ => main/satisfactory}/items/ProductionEdge.java (98%) rename src/{ => main/satisfactory}/items/Recipe.java (97%) rename src/{ => main/satisfactory}/items/requirements/Accumulator.java (93%) rename src/{ => main/satisfactory}/items/requirements/RateAccumulator.java (89%) rename src/{ => main/satisfactory}/items/requirements/RequirementAccumulator.java (62%) rename src/{ => main/satisfactory}/items/requirements/TotalAccumulator.java (85%) rename src/{ => main/satisfactory}/items/type/Fluid.java (66%) rename src/{ => main/satisfactory}/items/type/Ingot.java (65%) rename src/{ => main/satisfactory}/items/type/Ore.java (69%) rename src/{ => main/satisfactory}/items/type/Part.java (64%) rename src/{ => main/satisfactory}/items/type/Pickup.java (69%) rename src/{ => main/satisfactory}/items/type/ProcessedFluid.java (76%) rename src/{ => main/satisfactory}/items/type/RawFluid.java (77%) rename src/{ => main/satisfactory}/items/type/Tool.java (64%) rename src/test/{java => satisfactory}/items/ItemTest.java (96%) diff --git a/src/buildings/production/Assembler.java b/src/buildings/production/Assembler.java deleted file mode 100644 index 077a16d..0000000 --- a/src/buildings/production/Assembler.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Assembler extends Building { -} diff --git a/src/buildings/production/Constructor.java b/src/buildings/production/Constructor.java deleted file mode 100644 index 5079244..0000000 --- a/src/buildings/production/Constructor.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Constructor extends Building { -} diff --git a/src/buildings/production/CraftBench.java b/src/buildings/production/CraftBench.java deleted file mode 100644 index 974cede..0000000 --- a/src/buildings/production/CraftBench.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class CraftBench extends Building { -} diff --git a/src/buildings/production/EquipmentWorkshop.java b/src/buildings/production/EquipmentWorkshop.java deleted file mode 100644 index 1eaaab6..0000000 --- a/src/buildings/production/EquipmentWorkshop.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class EquipmentWorkshop extends Building { -} diff --git a/src/buildings/production/Foundry.java b/src/buildings/production/Foundry.java deleted file mode 100644 index 61f7463..0000000 --- a/src/buildings/production/Foundry.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Foundry extends Building { -} diff --git a/src/buildings/production/Manufacturer.java b/src/buildings/production/Manufacturer.java deleted file mode 100644 index 907e82d..0000000 --- a/src/buildings/production/Manufacturer.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Manufacturer extends Building { -} diff --git a/src/buildings/production/Miner.java b/src/buildings/production/Miner.java deleted file mode 100644 index 7f04e94..0000000 --- a/src/buildings/production/Miner.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Miner extends Building { -} diff --git a/src/buildings/production/OilExtractor.java b/src/buildings/production/OilExtractor.java deleted file mode 100644 index 93c6259..0000000 --- a/src/buildings/production/OilExtractor.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class OilExtractor extends Building { -} diff --git a/src/buildings/production/Packager.java b/src/buildings/production/Packager.java deleted file mode 100644 index d7d0ffb..0000000 --- a/src/buildings/production/Packager.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Packager extends Building { -} diff --git a/src/buildings/production/Refinery.java b/src/buildings/production/Refinery.java deleted file mode 100644 index eb51db2..0000000 --- a/src/buildings/production/Refinery.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Refinery extends Building { -} diff --git a/src/buildings/production/Smelter.java b/src/buildings/production/Smelter.java deleted file mode 100644 index e0ac198..0000000 --- a/src/buildings/production/Smelter.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class Smelter extends Building { -} diff --git a/src/buildings/production/WaterExtractor.java b/src/buildings/production/WaterExtractor.java deleted file mode 100644 index 9d1743f..0000000 --- a/src/buildings/production/WaterExtractor.java +++ /dev/null @@ -1,6 +0,0 @@ -package buildings.production; - -import buildings.Building; - -public class WaterExtractor extends Building { -} diff --git a/src/items/Database.java b/src/main/satisfactory/Database.java similarity index 99% rename from src/items/Database.java rename to src/main/satisfactory/Database.java index 96e42f3..a114186 100644 --- a/src/items/Database.java +++ b/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.*; diff --git a/src/Test.java b/src/main/satisfactory/Test.java similarity index 96% rename from src/Test.java rename to src/main/satisfactory/Test.java index 4ee2ff7..0c073df 100644 --- a/src/Test.java +++ b/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 totalRequirements = Database.HeavyModularFrame.getRecipe().getTotalRequirements(); System.out.println(totalRequirements); diff --git a/src/items/Utils.java b/src/main/satisfactory/Utils.java similarity index 98% rename from src/items/Utils.java rename to src/main/satisfactory/Utils.java index 8f4d223..4801dc6 100644 --- a/src/items/Utils.java +++ b/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; diff --git a/src/buildings/Building.java b/src/main/satisfactory/buildings/Building.java similarity index 52% rename from src/buildings/Building.java rename to src/main/satisfactory/buildings/Building.java index dafc823..2038ba0 100644 --- a/src/buildings/Building.java +++ b/src/main/satisfactory/buildings/Building.java @@ -1,4 +1,4 @@ -package buildings; +package satisfactory.buildings; public abstract class Building { } diff --git a/src/main/satisfactory/buildings/production/Assembler.java b/src/main/satisfactory/buildings/production/Assembler.java new file mode 100644 index 0000000..c6075f5 --- /dev/null +++ b/src/main/satisfactory/buildings/production/Assembler.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Assembler extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Constructor.java b/src/main/satisfactory/buildings/production/Constructor.java new file mode 100644 index 0000000..46b7dbb --- /dev/null +++ b/src/main/satisfactory/buildings/production/Constructor.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Constructor extends Building { +} diff --git a/src/main/satisfactory/buildings/production/CraftBench.java b/src/main/satisfactory/buildings/production/CraftBench.java new file mode 100644 index 0000000..c551375 --- /dev/null +++ b/src/main/satisfactory/buildings/production/CraftBench.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class CraftBench extends Building { +} diff --git a/src/main/satisfactory/buildings/production/EquipmentWorkshop.java b/src/main/satisfactory/buildings/production/EquipmentWorkshop.java new file mode 100644 index 0000000..4672d88 --- /dev/null +++ b/src/main/satisfactory/buildings/production/EquipmentWorkshop.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class EquipmentWorkshop extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Foundry.java b/src/main/satisfactory/buildings/production/Foundry.java new file mode 100644 index 0000000..75fdba5 --- /dev/null +++ b/src/main/satisfactory/buildings/production/Foundry.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Foundry extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Manufacturer.java b/src/main/satisfactory/buildings/production/Manufacturer.java new file mode 100644 index 0000000..ff8f104 --- /dev/null +++ b/src/main/satisfactory/buildings/production/Manufacturer.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Manufacturer extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Miner.java b/src/main/satisfactory/buildings/production/Miner.java new file mode 100644 index 0000000..5500474 --- /dev/null +++ b/src/main/satisfactory/buildings/production/Miner.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Miner extends Building { +} diff --git a/src/main/satisfactory/buildings/production/OilExtractor.java b/src/main/satisfactory/buildings/production/OilExtractor.java new file mode 100644 index 0000000..ef3ce46 --- /dev/null +++ b/src/main/satisfactory/buildings/production/OilExtractor.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class OilExtractor extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Packager.java b/src/main/satisfactory/buildings/production/Packager.java new file mode 100644 index 0000000..b1a425a --- /dev/null +++ b/src/main/satisfactory/buildings/production/Packager.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Packager extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Refinery.java b/src/main/satisfactory/buildings/production/Refinery.java new file mode 100644 index 0000000..654484d --- /dev/null +++ b/src/main/satisfactory/buildings/production/Refinery.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Refinery extends Building { +} diff --git a/src/main/satisfactory/buildings/production/Smelter.java b/src/main/satisfactory/buildings/production/Smelter.java new file mode 100644 index 0000000..095c401 --- /dev/null +++ b/src/main/satisfactory/buildings/production/Smelter.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class Smelter extends Building { +} diff --git a/src/main/satisfactory/buildings/production/WaterExtractor.java b/src/main/satisfactory/buildings/production/WaterExtractor.java new file mode 100644 index 0000000..8f01a62 --- /dev/null +++ b/src/main/satisfactory/buildings/production/WaterExtractor.java @@ -0,0 +1,6 @@ +package satisfactory.buildings.production; + +import satisfactory.buildings.Building; + +public class WaterExtractor extends Building { +} diff --git a/src/items/Item.java b/src/main/satisfactory/items/Item.java similarity index 98% rename from src/items/Item.java rename to src/main/satisfactory/items/Item.java index a960173..52f42ad 100644 --- a/src/items/Item.java +++ b/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.*; diff --git a/src/items/ProductionEdge.java b/src/main/satisfactory/items/ProductionEdge.java similarity index 98% rename from src/items/ProductionEdge.java rename to src/main/satisfactory/items/ProductionEdge.java index 1e15c93..b3d6c69 100644 --- a/src/items/ProductionEdge.java +++ b/src/main/satisfactory/items/ProductionEdge.java @@ -1,4 +1,4 @@ -package items; +package satisfactory.items; import java.util.Objects; diff --git a/src/items/Recipe.java b/src/main/satisfactory/items/Recipe.java similarity index 97% rename from src/items/Recipe.java rename to src/main/satisfactory/items/Recipe.java index 11e479b..588df45 100644 --- a/src/items/Recipe.java +++ b/src/main/satisfactory/items/Recipe.java @@ -1,7 +1,7 @@ -package items; +package satisfactory.items; -import items.requirements.RateAccumulator; -import items.requirements.TotalAccumulator; +import satisfactory.items.requirements.RateAccumulator; +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) diff --git a/src/items/requirements/Accumulator.java b/src/main/satisfactory/items/requirements/Accumulator.java similarity index 93% rename from src/items/requirements/Accumulator.java rename to src/main/satisfactory/items/requirements/Accumulator.java index d3b29ef..9654769 100644 --- a/src/items/requirements/Accumulator.java +++ b/src/main/satisfactory/items/requirements/Accumulator.java @@ -1,7 +1,7 @@ -package items.requirements; +package satisfactory.items.requirements; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; import java.util.HashMap; import java.util.Map; diff --git a/src/items/requirements/RateAccumulator.java b/src/main/satisfactory/items/requirements/RateAccumulator.java similarity index 89% rename from src/items/requirements/RateAccumulator.java rename to src/main/satisfactory/items/requirements/RateAccumulator.java index 2e6770d..be84bb4 100644 --- a/src/items/requirements/RateAccumulator.java +++ b/src/main/satisfactory/items/requirements/RateAccumulator.java @@ -1,7 +1,7 @@ -package items.requirements; +package satisfactory.items.requirements; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; import java.util.HashMap; import java.util.Map; diff --git a/src/items/requirements/RequirementAccumulator.java b/src/main/satisfactory/items/requirements/RequirementAccumulator.java similarity index 62% rename from src/items/requirements/RequirementAccumulator.java rename to src/main/satisfactory/items/requirements/RequirementAccumulator.java index cb971c2..89e5ad5 100644 --- a/src/items/requirements/RequirementAccumulator.java +++ b/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; diff --git a/src/items/requirements/TotalAccumulator.java b/src/main/satisfactory/items/requirements/TotalAccumulator.java similarity index 85% rename from src/items/requirements/TotalAccumulator.java rename to src/main/satisfactory/items/requirements/TotalAccumulator.java index 26a7362..67ecad3 100644 --- a/src/items/requirements/TotalAccumulator.java +++ b/src/main/satisfactory/items/requirements/TotalAccumulator.java @@ -1,7 +1,7 @@ -package items.requirements; +package satisfactory.items.requirements; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; import java.util.Map; diff --git a/src/items/type/Fluid.java b/src/main/satisfactory/items/type/Fluid.java similarity index 66% rename from src/items/type/Fluid.java rename to src/main/satisfactory/items/type/Fluid.java index ccafc1c..5c504f6 100644 --- a/src/items/type/Fluid.java +++ b/src/main/satisfactory/items/type/Fluid.java @@ -1,7 +1,7 @@ -package items.type; +package satisfactory.items.type; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; public abstract class Fluid extends Item { diff --git a/src/items/type/Ingot.java b/src/main/satisfactory/items/type/Ingot.java similarity index 65% rename from src/items/type/Ingot.java rename to src/main/satisfactory/items/type/Ingot.java index f6e6aec..0acd7ed 100644 --- a/src/items/type/Ingot.java +++ b/src/main/satisfactory/items/type/Ingot.java @@ -1,7 +1,7 @@ -package items.type; +package satisfactory.items.type; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; public class Ingot extends Item { diff --git a/src/items/type/Ore.java b/src/main/satisfactory/items/type/Ore.java similarity index 69% rename from src/items/type/Ore.java rename to src/main/satisfactory/items/type/Ore.java index fa47175..b3a928f 100644 --- a/src/items/type/Ore.java +++ b/src/main/satisfactory/items/type/Ore.java @@ -1,7 +1,7 @@ -package items.type; +package satisfactory.items.type; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; public class Ore extends Item { diff --git a/src/items/type/Part.java b/src/main/satisfactory/items/type/Part.java similarity index 64% rename from src/items/type/Part.java rename to src/main/satisfactory/items/type/Part.java index b75c7bb..4029797 100644 --- a/src/items/type/Part.java +++ b/src/main/satisfactory/items/type/Part.java @@ -1,7 +1,7 @@ -package items.type; +package satisfactory.items.type; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; public class Part extends Item { diff --git a/src/items/type/Pickup.java b/src/main/satisfactory/items/type/Pickup.java similarity index 69% rename from src/items/type/Pickup.java rename to src/main/satisfactory/items/type/Pickup.java index 8c5a893..f24833b 100644 --- a/src/items/type/Pickup.java +++ b/src/main/satisfactory/items/type/Pickup.java @@ -1,7 +1,7 @@ -package items.type; +package satisfactory.items.type; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; public class Pickup extends Item { diff --git a/src/items/type/ProcessedFluid.java b/src/main/satisfactory/items/type/ProcessedFluid.java similarity index 76% rename from src/items/type/ProcessedFluid.java rename to src/main/satisfactory/items/type/ProcessedFluid.java index af8b1ab..f5b9209 100644 --- a/src/items/type/ProcessedFluid.java +++ b/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 { diff --git a/src/items/type/RawFluid.java b/src/main/satisfactory/items/type/RawFluid.java similarity index 77% rename from src/items/type/RawFluid.java rename to src/main/satisfactory/items/type/RawFluid.java index 072ad8d..4e89e78 100644 --- a/src/items/type/RawFluid.java +++ b/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 { diff --git a/src/items/type/Tool.java b/src/main/satisfactory/items/type/Tool.java similarity index 64% rename from src/items/type/Tool.java rename to src/main/satisfactory/items/type/Tool.java index 8dacde7..c1a4f4f 100644 --- a/src/items/type/Tool.java +++ b/src/main/satisfactory/items/type/Tool.java @@ -1,7 +1,7 @@ -package items.type; +package satisfactory.items.type; -import items.Item; -import items.Recipe; +import satisfactory.items.Item; +import satisfactory.items.Recipe; public class Tool extends Item { diff --git a/src/test/java/items/ItemTest.java b/src/test/satisfactory/items/ItemTest.java similarity index 96% rename from src/test/java/items/ItemTest.java rename to src/test/satisfactory/items/ItemTest.java index a4411a7..6f0b534 100644 --- a/src/test/java/items/ItemTest.java +++ b/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