agp8x
/
satisfactory
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Compare commits

base: agp8x:ecf00146836a3cdc5c24f435e393a714d3aafbb4
Branches Tags
agp8x:master
..
compare: agp8x:1d5c39b9e5424f29eb9690dd0ff1d2001a31a324
Branches Tags
agp8x:master

No commits in common. "ecf00146836a3cdc5c24f435e393a714d3aafbb4" and "1d5c39b9e5424f29eb9690dd0ff1d2001a31a324" have entirely different histories.
ecf0014683 ... 1d5c39b9e5

5 changed files with 416 additions and 654 deletions
Show Stats Expand all files Collapse all files

1027
src/main/java/satisfactory/Database.java
View File

File diff suppressed because it is too large Load Diff

29
src/main/java/satisfactory/Test.java
View File

@ -7,7 +7,6 @@ import satisfactory.items.Recipe;
import satisfactory.items.SumResult; import satisfactory.items.SumResult;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import static satisfactory.Utils.*; import static satisfactory.Utils.*;
@ -138,33 +137,7 @@ public class Test {
*/ */
//planFor("aluminumIngot", new Production(Database.AluminumIngot, 240)); //planFor("aluminumIngot", new Production(Database.AluminumIngot, 240));
//planFor("fusedFrame", new Production(Database.FusedModularFrame, 1.5)); //planFor("fusedFrame", new Production(Database.FusedModularFrame, 1.5));
/*planFor( planFor("p4", new Production(Database.AssemblyDirectorSystem,4), new Production(Database.MagneticFieldGenerator, 4), new Production(Database.ThermalPropulsionRocket, 1), new Production(Database.NuclearPasta, 1));
"p4",
new Production(Database.AssemblyDirectorSystem,4),
new Production(Database.MagneticFieldGenerator, 4),
new Production(Database.ThermalPropulsionRocket, 1),
new Production(Database.NuclearPasta, 1)
);
planFor(
"p4_nuclearPasta",
new Production(Database.NuclearPasta, 1)
);
planFor(
"p4_nuclearPasta_200copperpowder",
new Production(Database.CopperPowder, 200)
);
planFor("turboFuel", new Production(Database.Turbofuel, 1));*/
// 1.0
//planFor("p1_1.0", new Production(Database.SmartPlating, 4));
//planFor("2xmk2impure_mod_frame", new Production(Database.ModularFrame, 5));
Optional<Recipe> castScrewOpt = Database.Screw.getRecipes().stream().filter(recipe -> "Cast Screw".equals(recipe.getName())).findFirst();
Recipe castScrew = castScrewOpt.get();
Database.Screw.setPreference(castScrew);
//planFor("2xmk2impure_mod_frame_cast", new Production(Database.ModularFrame, 5));
//planFor("p2_1.0_cast", new Production(Database.SmartPlating, 4), new Production(Database.VersatileFrameWork, 4), new Production(Database.AutomatedWiring, 0.25));
planFor("p2_1.0_cast", new Production(Database.SmartPlating, 8), new Production(Database.VersatileFrameWork, 8), new Production(Database.AutomatedWiring, 0.5));
} }
private static void planFor(Item item, int amount, String name) { private static void planFor(Item item, int amount, String name) {

2
src/main/java/satisfactory/items/RecipeBuilder.java
View File

@ -82,7 +82,7 @@ public class RecipeBuilder {
if (outputs.isEmpty()){ if (outputs.isEmpty()){
throw new IllegalStateException("no outputs set"); throw new IllegalStateException("no outputs set");
} }
Recipe recipe = new Recipe(duration, inputs,outputs, byProducts, building, name, isHandCraftable); Recipe recipe = new Recipe(duration, inputs,outputs, byProducts,building,name,isHandCraftable );
outputs.keySet().forEach(item -> item.add(recipe)); outputs.keySet().forEach(item -> item.add(recipe));
return recipe; return recipe;
} }

5
src/test/java/satisfactory/items/ItemTest.java
View File

@ -72,9 +72,4 @@ class ItemTest {
test("aluminumIngot", Database.AluminumIngot); test("aluminumIngot", Database.AluminumIngot);
} }
@Test
void productionBattery() {
test("battery", Database.Battery);
}
} }

7
src/test/java/satisfactory/items/ValidatedValues.java
View File

@ -107,13 +107,6 @@ public class ValidatedValues {
ref.put(item, 1.0); ref.put(item, 1.0);
values.put(item, ref); values.put(item, ref);
} }
{
Item item = Database.Battery;
Map<Item, Double> ref = new HashMap<>();
ref.put(Database.Water, 0.0); // TODO: get values
ref.put(item, 1d);
values.put(item, ref);
}
} }
public static Map<Item, Double> get(Item item) { public static Map<Item, Double> get(Item item) {