From c4cf7c9ec9867610e1847152dcc304879cf70673 Mon Sep 17 00:00:00 2001 From: agp8x Date: Mon, 10 Apr 2023 00:12:55 +0200 Subject: [PATCH] improve building list format --- src/main/java/satisfactory/items/Recipe.java | 8 +++++++- src/main/java/satisfactory/items/SumResult.java | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/satisfactory/items/Recipe.java b/src/main/java/satisfactory/items/Recipe.java index 06d26af..c1e5a42 100644 --- a/src/main/java/satisfactory/items/Recipe.java +++ b/src/main/java/satisfactory/items/Recipe.java @@ -247,8 +247,14 @@ public class Recipe { public String getName() { return name; } + public String formatName(){ + if (name == null) { + return formatOutputs(); + } + return name + " (" + formatOutputs() + ")"; + } - public String getOutputs() { + public String formatOutputs() { return outputs.keySet().stream().map(Item::getName).collect(Collectors.joining(" + ")); } } diff --git a/src/main/java/satisfactory/items/SumResult.java b/src/main/java/satisfactory/items/SumResult.java index 46b0005..53021eb 100644 --- a/src/main/java/satisfactory/items/SumResult.java +++ b/src/main/java/satisfactory/items/SumResult.java @@ -102,9 +102,9 @@ public class SumResult { StringBuilder internal = new StringBuilder(); for (Map.Entry recipes : entry.getValue().entrySet()) { sum += Math.ceil(recipes.getValue()); - internal.append("\t").append(recipes.getKey().getName()).append(" (").append(recipes.getKey().getOutputs()).append(")\t").append(recipes.getValue()).append("\n"); + internal.append("\t").append(recipes.getKey().formatName()).append("\t").append(recipes.getValue()).append("\n"); } - sb.append(entry.getKey().getName().replace("satisfactory.buildings.production.","")). append("\t"). append(sum).append("\n").append(internal); + sb.append(entry.getKey().getName()). append("\t"). append(sum).append("\n").append(internal); } return sb.toString(); }