From c42915ecb4013f69a4052bf514a8a02ff893621d Mon Sep 17 00:00:00 2001 From: agp8x Date: Sun, 9 Apr 2023 11:17:57 +0200 Subject: [PATCH] reformat --- src/main/java/satisfactory/Database.java | 15 +------- src/main/java/satisfactory/Test.java | 11 +++--- src/main/java/satisfactory/Utils.java | 1 - .../buildings/power/GeothermalGenerator.java | 10 +++--- .../power/PowerGenerationBuilding.java | 2 +- .../buildings/production/MinerMk2.java | 2 +- .../buildings/production/MinerMk3.java | 2 +- src/main/java/satisfactory/items/Item.java | 35 ++++++++++--------- src/main/java/satisfactory/items/Recipe.java | 2 +- .../java/satisfactory/items/SumResult.java | 31 ++++++++-------- .../java/satisfactory/items/type/Fluid.java | 7 ++-- .../java/satisfactory/items/type/Gas.java | 9 +++-- .../java/satisfactory/items/type/Ingot.java | 7 ++-- .../java/satisfactory/items/type/Ore.java | 9 +++-- .../java/satisfactory/items/type/Part.java | 7 ++-- .../java/satisfactory/items/type/Pickup.java | 9 +++-- .../items/type/ProcessedFluid.java | 8 ++--- .../satisfactory/items/type/RawFluid.java | 10 +++--- .../java/satisfactory/items/type/Tool.java | 7 ++-- 19 files changed, 80 insertions(+), 104 deletions(-) diff --git a/src/main/java/satisfactory/Database.java b/src/main/java/satisfactory/Database.java index ca2bfd4..328f4da 100644 --- a/src/main/java/satisfactory/Database.java +++ b/src/main/java/satisfactory/Database.java @@ -8,9 +8,7 @@ import satisfactory.items.type.*; import java.util.*; public class Database { - private static final Collection items = new HashSet<>(); public static final Map preferences = new HashMap<>(); - // Items & recipes public static final Item IronOre = new Ore("Iron Ore"); public static final Item IronIngot = new Ingot("Iron Ingot"); @@ -95,29 +93,17 @@ public class Database { public static final Item Silica = new Part("Silica"); public static final Item Bauxite = new Ore("Bauxite"); public static final Item AluminaSolution = new ProcessedFluid("Alumina Solution"); - public static final Item SulfuricAcid = new ProcessedFluid("Sulfuric Acid"); - public static final Item EncasedUraniumCell = new Part("Encased Uranium Cell"); - public static final Item ElectromagneticControlRod = new Part("Electromagnetic Control Rod"); - public static final Item UraniumFuelRod = new Part("Uranium Fuel Rod"); - public static final Item Uranium = new Ore("Uranium"); - public static final Item Battery = new Part("Battery"); - public static final Item MagneticFieldGenerator = new Part("Magnetic Field Generator"); - public static final Item HeatSink = new Part("Heat Sink"); - public static final Item AssemblyDirectorSystem = new Part("Assembly Director System"); - public static final Item NitrogenGas = new Gas("Nitrogen Gas"); - public static final Item CoolingSystem = new Part("Cooling System"); - public static final Item FusedModularFrame = new Part("Fused Modular Frame"); public static final Item PortableMiner = new Tool("Portable Miner"); public static final Item Turbofuel = new ProcessedFluid("Turbofuel"); @@ -133,6 +119,7 @@ public class Database { public static final Item ClusterNobelisk = new Part("Cluster Nobelisk"); public static final Item ObjectScanner = new Tool("Object Scanner"); public static final Item NobeliskDetonator = new Tool("Nobelisk Detonator"); + private static final Collection items = new HashSet<>(); static { { diff --git a/src/main/java/satisfactory/Test.java b/src/main/java/satisfactory/Test.java index 5a87ff3..d7359d5 100644 --- a/src/main/java/satisfactory/Test.java +++ b/src/main/java/satisfactory/Test.java @@ -3,8 +3,6 @@ package satisfactory; import com.fasterxml.jackson.core.JsonProcessingException; import guru.nidi.graphviz.engine.Format; import guru.nidi.graphviz.engine.Graphviz; -import guru.nidi.graphviz.engine.GraphvizCmdLineEngine; -import guru.nidi.graphviz.engine.GraphvizJdkEngine; import guru.nidi.graphviz.model.MutableGraph; import guru.nidi.graphviz.parse.Parser; import org.jgrapht.Graph; @@ -21,8 +19,10 @@ import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; -import java.util.*; -import java.util.concurrent.Callable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import static satisfactory.Utils.*; @@ -204,9 +204,8 @@ public class Test { } // ref.put(Database.CircuitBoard, 15.0); try (BufferedWriter bw = new BufferedWriter(new FileWriter(LISTS + name + "_java.txt"))) { - String list = plan.getMap().entrySet().stream().map(item -> - "ref.put(Database." + name2(item.getKey().getName()) + ", " + item.getValue() + ");" + "ref.put(Database." + name2(item.getKey().getName()) + ", " + item.getValue() + ");" ).reduce("", (s, s2) -> s + "\n" + s2); bw.write(list); } catch (IOException e) { diff --git a/src/main/java/satisfactory/Utils.java b/src/main/java/satisfactory/Utils.java index 946985a..3328076 100644 --- a/src/main/java/satisfactory/Utils.java +++ b/src/main/java/satisfactory/Utils.java @@ -18,7 +18,6 @@ import satisfactory.items.ProductionEdge; import java.io.File; import java.util.HashMap; import java.util.Map; -import java.util.stream.Collectors; public class Utils { diff --git a/src/main/java/satisfactory/buildings/power/GeothermalGenerator.java b/src/main/java/satisfactory/buildings/power/GeothermalGenerator.java index 0de32fb..1318d58 100644 --- a/src/main/java/satisfactory/buildings/power/GeothermalGenerator.java +++ b/src/main/java/satisfactory/buildings/power/GeothermalGenerator.java @@ -5,10 +5,10 @@ import satisfactory.Database; public class GeothermalGenerator extends PowerGenerationBuilding { public GeothermalGenerator() { power = 9999; // TODO - cost.put(Database.SuperComputer,8); - cost.put(Database.HeavyModularFrame,16); - cost.put(Database.HighSpeedConnector,16); - cost.put(Database.CopperSheet,40); - cost.put(Database.Rubber,80); + cost.put(Database.SuperComputer, 8); + cost.put(Database.HeavyModularFrame, 16); + cost.put(Database.HighSpeedConnector, 16); + cost.put(Database.CopperSheet, 40); + cost.put(Database.Rubber, 80); } } diff --git a/src/main/java/satisfactory/buildings/power/PowerGenerationBuilding.java b/src/main/java/satisfactory/buildings/power/PowerGenerationBuilding.java index 2cdc538..7bce3b1 100644 --- a/src/main/java/satisfactory/buildings/power/PowerGenerationBuilding.java +++ b/src/main/java/satisfactory/buildings/power/PowerGenerationBuilding.java @@ -10,6 +10,6 @@ public abstract class PowerGenerationBuilding extends Building { protected Map consumes; public PowerGenerationBuilding() { - consumes=new HashMap<>(); + consumes = new HashMap<>(); } } diff --git a/src/main/java/satisfactory/buildings/production/MinerMk2.java b/src/main/java/satisfactory/buildings/production/MinerMk2.java index 46aaa62..87ba7ff 100644 --- a/src/main/java/satisfactory/buildings/production/MinerMk2.java +++ b/src/main/java/satisfactory/buildings/production/MinerMk2.java @@ -2,7 +2,7 @@ package satisfactory.buildings.production; import satisfactory.Database; -public class MinerMk2 extends MinerMk1{ +public class MinerMk2 extends MinerMk1 { public MinerMk2() { power = 12; cost.put(Database.PortableMiner, 2); diff --git a/src/main/java/satisfactory/buildings/production/MinerMk3.java b/src/main/java/satisfactory/buildings/production/MinerMk3.java index 7940425..297e898 100644 --- a/src/main/java/satisfactory/buildings/production/MinerMk3.java +++ b/src/main/java/satisfactory/buildings/production/MinerMk3.java @@ -2,7 +2,7 @@ package satisfactory.buildings.production; import satisfactory.Database; -public class MinerMk3 extends MinerMk1{ +public class MinerMk3 extends MinerMk1 { public MinerMk3() { // TODO: real values! power = 12; diff --git a/src/main/java/satisfactory/items/Item.java b/src/main/java/satisfactory/items/Item.java index d515968..adfd3de 100644 --- a/src/main/java/satisfactory/items/Item.java +++ b/src/main/java/satisfactory/items/Item.java @@ -4,15 +4,18 @@ import org.jgrapht.Graph; import org.jgrapht.graph.DefaultWeightedEdge; import satisfactory.Database; -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; public abstract class Item { - protected boolean isRaw = false; private final String name; private final Set recipes; - private Recipe preference = null; public int sum = 0; + protected boolean isRaw = false; + private Recipe preference = null; protected Item(String name, Set recipes) { this.name = name; @@ -27,6 +30,15 @@ public abstract class Item { this(name, new HashSet<>()); } + public static Map production(Graph graph) { + Map map = new HashMap<>(); + graph.vertexSet().forEach(item -> { + double rate = graph.outgoingEdgesOf(item).stream().mapToDouble(graph::getEdgeWeight).sum(); + map.put(item, rate); + }); + return map; + } + public void add(Recipe recipe) { if (recipes.isEmpty()) { setPreference(recipe); @@ -84,19 +96,6 @@ public abstract class Item { '}'; } - public void setPreference(Recipe preference) { - this.preference = preference; - } - - public static Map production(Graph graph) { - Map map = new HashMap<>(); - graph.vertexSet().forEach(item -> { - double rate = graph.outgoingEdgesOf(item).stream().mapToDouble(graph::getEdgeWeight).sum(); - map.put(item, rate); - }); - return map; - } - public Graph hierarchy() { System.out.println(getRecipe() + " == " + this.preference); return getRecipe().buildGraph(this); @@ -110,4 +109,8 @@ public abstract class Item { return preference; } + public void setPreference(Recipe preference) { + this.preference = preference; + } + } diff --git a/src/main/java/satisfactory/items/Recipe.java b/src/main/java/satisfactory/items/Recipe.java index 4161e82..1846658 100644 --- a/src/main/java/satisfactory/items/Recipe.java +++ b/src/main/java/satisfactory/items/Recipe.java @@ -14,9 +14,9 @@ import java.util.stream.Collectors; public class Recipe { private final Map inputs; private final Map outputs; + private final int duration; private boolean isHandCraftable = true; private String name; - private final int duration; public Recipe(int duration, Class building) { this(duration, new HashMap<>(), new HashMap<>(), building); diff --git a/src/main/java/satisfactory/items/SumResult.java b/src/main/java/satisfactory/items/SumResult.java index e20ccb6..9bf5a04 100644 --- a/src/main/java/satisfactory/items/SumResult.java +++ b/src/main/java/satisfactory/items/SumResult.java @@ -7,7 +7,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; public class SumResult { private final Graph production; @@ -23,21 +22,6 @@ public class SumResult { map = new HashMap<>(); } - public Graph getProduction() { - return production; - } - - public Map getMap() { - return map; - } - - public SumResult merge(SumResult other) { - HashMap map = new HashMap<>(); - map.putAll(this.map); - other.map.forEach((item, aDouble) -> map.merge(item, aDouble, Double::sum)); - return new SumResult(merge(production, other.getProduction()), map); - } - public static Graph sum(Item item, int amount) { return item.getRecipe().sum(item, amount).getProduction(); } @@ -77,4 +61,19 @@ public class SumResult { }); return result; } + + public Graph getProduction() { + return production; + } + + public Map getMap() { + return map; + } + + public SumResult merge(SumResult other) { + HashMap map = new HashMap<>(); + map.putAll(this.map); + other.map.forEach((item, aDouble) -> map.merge(item, aDouble, Double::sum)); + return new SumResult(merge(production, other.getProduction()), map); + } } diff --git a/src/main/java/satisfactory/items/type/Fluid.java b/src/main/java/satisfactory/items/type/Fluid.java index 78132a4..9d9bc21 100644 --- a/src/main/java/satisfactory/items/type/Fluid.java +++ b/src/main/java/satisfactory/items/type/Fluid.java @@ -1,11 +1,10 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public abstract class Fluid extends Item { - public Fluid(String name) { - super(name); - } + public Fluid(String name) { + super(name); + } } diff --git a/src/main/java/satisfactory/items/type/Gas.java b/src/main/java/satisfactory/items/type/Gas.java index 6cd8527..34cea0c 100644 --- a/src/main/java/satisfactory/items/type/Gas.java +++ b/src/main/java/satisfactory/items/type/Gas.java @@ -1,13 +1,12 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public class Gas extends Item { - public Gas(String name) { - super(name); - setIsRaw(); - } + public Gas(String name) { + super(name); + setIsRaw(); + } } diff --git a/src/main/java/satisfactory/items/type/Ingot.java b/src/main/java/satisfactory/items/type/Ingot.java index b09bcd0..2091511 100644 --- a/src/main/java/satisfactory/items/type/Ingot.java +++ b/src/main/java/satisfactory/items/type/Ingot.java @@ -1,11 +1,10 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public class Ingot extends Item { - public Ingot(String name) { - super(name); - } + public Ingot(String name) { + super(name); + } } diff --git a/src/main/java/satisfactory/items/type/Ore.java b/src/main/java/satisfactory/items/type/Ore.java index 3641366..3e83fda 100644 --- a/src/main/java/satisfactory/items/type/Ore.java +++ b/src/main/java/satisfactory/items/type/Ore.java @@ -1,13 +1,12 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public class Ore extends Item { - public Ore(String name) { - super(name); - setIsRaw(); - } + public Ore(String name) { + super(name); + setIsRaw(); + } } diff --git a/src/main/java/satisfactory/items/type/Part.java b/src/main/java/satisfactory/items/type/Part.java index d8aa3c5..825720b 100644 --- a/src/main/java/satisfactory/items/type/Part.java +++ b/src/main/java/satisfactory/items/type/Part.java @@ -1,11 +1,10 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public class Part extends Item { - public Part(String name) { - super(name); - } + public Part(String name) { + super(name); + } } diff --git a/src/main/java/satisfactory/items/type/Pickup.java b/src/main/java/satisfactory/items/type/Pickup.java index 6dafd33..329ce10 100644 --- a/src/main/java/satisfactory/items/type/Pickup.java +++ b/src/main/java/satisfactory/items/type/Pickup.java @@ -1,12 +1,11 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public class Pickup extends Item { - public Pickup(String name) { - super(name); - setIsRaw(); - } + public Pickup(String name) { + super(name); + setIsRaw(); + } } diff --git a/src/main/java/satisfactory/items/type/ProcessedFluid.java b/src/main/java/satisfactory/items/type/ProcessedFluid.java index 97de2eb..fca5b8b 100644 --- a/src/main/java/satisfactory/items/type/ProcessedFluid.java +++ b/src/main/java/satisfactory/items/type/ProcessedFluid.java @@ -1,10 +1,8 @@ package satisfactory.items.type; -import satisfactory.items.Recipe; - public class ProcessedFluid extends Fluid { - public ProcessedFluid(String name) { - super(name); - } + public ProcessedFluid(String name) { + super(name); + } } diff --git a/src/main/java/satisfactory/items/type/RawFluid.java b/src/main/java/satisfactory/items/type/RawFluid.java index 44ae9e7..1ef9800 100644 --- a/src/main/java/satisfactory/items/type/RawFluid.java +++ b/src/main/java/satisfactory/items/type/RawFluid.java @@ -1,11 +1,9 @@ package satisfactory.items.type; -import satisfactory.items.Recipe; - public class RawFluid extends Fluid { - public RawFluid(String name) { - super(name); - setIsRaw(); - } + public RawFluid(String name) { + super(name); + setIsRaw(); + } } diff --git a/src/main/java/satisfactory/items/type/Tool.java b/src/main/java/satisfactory/items/type/Tool.java index f654641..9f91f52 100644 --- a/src/main/java/satisfactory/items/type/Tool.java +++ b/src/main/java/satisfactory/items/type/Tool.java @@ -1,11 +1,10 @@ package satisfactory.items.type; import satisfactory.items.Item; -import satisfactory.items.Recipe; public class Tool extends Item { - public Tool(String name) { - super(name); - } + public Tool(String name) { + super(name); + } }