From 6b2a93ea747b1a4e0e1603e5f1e705e6f21066ab Mon Sep 17 00:00:00 2001
From: D-Cysteine <54219287+D-Cysteine@users.noreply.github.com>
Date: Wed, 4 Jan 2023 05:14:18 -0700
Subject: [PATCH] Fix shaped recipes

---
 libs/NESQL-Exporter-0.1.0-sql.jar             | Bin 34865 -> 34870 bytes
 .../base/display/recipe/DisplayRecipe.java    |  66 ++++++++----------
 .../nesql/server/service/SearchService.java   |  20 +++---
 src/main/resources/static/css/main.css        |   4 +-
 4 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/libs/NESQL-Exporter-0.1.0-sql.jar b/libs/NESQL-Exporter-0.1.0-sql.jar
index 8f1ec05281447a126109a64fd53e63a008e074fb..36b2f4e4720b9bf2aaf84689fe053f3a6edd9715 100644
GIT binary patch
delta 4238
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
KQ?&&FBmV(^4pQU*

delta 4143
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
a^#9Mr|GMS>PAoxh;~4Hjshc7I%fA3B(mGWD

diff --git a/src/main/java/com/github/dcysteine/nesql/server/plugin/base/display/recipe/DisplayRecipe.java b/src/main/java/com/github/dcysteine/nesql/server/plugin/base/display/recipe/DisplayRecipe.java
index caafbaa..4adb3ad 100644
--- a/src/main/java/com/github/dcysteine/nesql/server/plugin/base/display/recipe/DisplayRecipe.java
+++ b/src/main/java/com/github/dcysteine/nesql/server/plugin/base/display/recipe/DisplayRecipe.java
@@ -14,8 +14,10 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableTable;
+import com.google.common.collect.Maps;
 
 import java.util.Iterator;
+import java.util.Map;
 
 /**
  * Packages up a {@link Recipe} for displaying on a page.
@@ -28,34 +30,30 @@ public abstract class DisplayRecipe implements Comparable<DisplayRecipe> {
     public static DisplayRecipe create(Recipe recipe, ItemRepository itemRepository) {
         DisplayRecipeType displayRecipeType = DisplayRecipeType.create(recipe.getRecipeType());
 
-        ImmutableList<Icon> displayItemInputs =
-                recipe.getItemInputs().stream()
-                        .map(itemGroup -> DisplayItemGroup.buildIcon(itemGroup, itemRepository))
-                        .collect(ImmutableList.toImmutableList());
+        Map<Integer, Icon> displayItemInputs =
+                Maps.transformValues(
+                        recipe.getItemInputs(),
+                        itemGroup -> DisplayItemGroup.buildIcon(itemGroup, itemRepository));
         ImmutableTable<Integer, Integer, Icon> itemInputs =
                 buildIngredientsGrid(
                         displayRecipeType.getItemInputGrid(), displayItemInputs, recipe);
 
-        ImmutableList<Icon> displayFluidInputs =
-                recipe.getFluidInputs().stream()
-                        .map(DisplayFluidGroup::buildIcon)
-                        .collect(ImmutableList.toImmutableList());
+        Map<Integer, Icon> displayFluidInputs =
+                Maps.transformValues(recipe.getFluidInputs(), DisplayFluidGroup::buildIcon);
         ImmutableTable<Integer, Integer, Icon> fluidInputs =
                 buildIngredientsGrid(
                         displayRecipeType.getFluidInputGrid(), displayFluidInputs, recipe);
 
-        ImmutableList<Icon> displayItemOutputs =
-                recipe.getItemOutputs().stream()
-                        .map(DisplayItemStackWithProbability::buildIcon)
-                        .collect(ImmutableList.toImmutableList());
+        Map<Integer, Icon> displayItemOutputs =
+                Maps.transformValues(
+                        recipe.getItemOutputs(), DisplayItemStackWithProbability::buildIcon);
         ImmutableTable<Integer, Integer, Icon> itemOutputs =
                 buildIngredientsGrid(
                         displayRecipeType.getItemOutputGrid(), displayItemOutputs, recipe);
 
-        ImmutableList<Icon> displayFluidOutputs =
-                recipe.getFluidOutputs().stream()
-                        .map(DisplayFluidStackWithProbability::buildIcon)
-                        .collect(ImmutableList.toImmutableList());
+        Map<Integer, Icon> displayFluidOutputs =
+                Maps.transformValues(
+                        recipe.getFluidOutputs(), DisplayFluidStackWithProbability::buildIcon);
         ImmutableTable<Integer, Integer, Icon> fluidOutputs =
                 buildIngredientsGrid(
                         displayRecipeType.getFluidOutputGrid(), displayFluidOutputs, recipe);
@@ -113,33 +111,27 @@ public static Icon buildIcon(Recipe recipe) {
     public abstract ImmutableTable<Integer, Integer, Icon> getFluidOutputs();
 
     private static ImmutableTable<Integer, Integer, Icon> buildIngredientsGrid(
-            Dimension gridDimension, Iterable<Icon> ingredients, Recipe recipe) {
+            Dimension gridDimension, Map<Integer, Icon> ingredients, Recipe recipe) {
         ImmutableTable.Builder<Integer, Integer, Icon> builder = ImmutableTable.builder();
-        Iterator<Icon> iterator = ingredients.iterator();
-        for (int row = 0; row < gridDimension.getHeight(); row++) {
-            for (int col = 0; col < gridDimension.getHeight(); col++) {
-                if (!iterator.hasNext()) {
-                    break;
-                }
-
-                Icon icon = iterator.next();
-                if (icon != null) {
-                    builder.put(row, col, icon);
-                }
+        int excessEntries = 0;
+        int maxIndex = 0;
+        for (Map.Entry<Integer, Icon> entry : ingredients.entrySet()) {
+            int row = entry.getKey() / gridDimension.getWidth();
+            int col = entry.getKey() % gridDimension.getWidth();
+            builder.put(row, col, entry.getValue());
+
+            if (row >= gridDimension.getHeight()) {
+                excessEntries++;
+                maxIndex = Math.max(maxIndex, entry.getKey());
             }
         }
 
-        if (iterator.hasNext()) {
-            int excess = 0;
-            while (iterator.hasNext()) {
-                excess++;
-                iterator.next();
-            }
-
+        if (excessEntries > 0) {
             Main.Logger.error(
                     "Tried to build recipe ingredients grid with too many ingredients!\n"
-                    + "Expected {}x{}; got {} excess for recipe {}",
-                    gridDimension.getWidth(), gridDimension.getHeight(), excess, recipe.getId());
+                            + "Expected {}x{}; got {} excess, {} max index for recipe {}",
+                    gridDimension.getHeight(), gridDimension.getWidth(),
+                    excessEntries, maxIndex, recipe.getId());
         }
 
         return builder.build();
diff --git a/src/main/java/com/github/dcysteine/nesql/server/service/SearchService.java b/src/main/java/com/github/dcysteine/nesql/server/service/SearchService.java
index 3e27e56..c20f421 100644
--- a/src/main/java/com/github/dcysteine/nesql/server/service/SearchService.java
+++ b/src/main/java/com/github/dcysteine/nesql/server/service/SearchService.java
@@ -27,17 +27,17 @@ public <T extends JpaSpecificationExecutor<R>, R, D> String handleGetAll(
     public <T extends JpaSpecificationExecutor<R>, R, D> String handleSearch(
             int page, Model model,
             T repository, Specification<R> spec, Function<R, D> buildDisplay) {
-            // Pageable uses 0-index page, but we want 1-indexed.
-            Pageable pageable = Pageable.ofSize(externalConfig.getPageSize()).withPage(page - 1);
-            Page<D> results = repository.findAll(spec, pageable).map(buildDisplay);
+        // Pageable uses 0-index page, but we want 1-indexed.
+        Pageable pageable = Pageable.ofSize(externalConfig.getPageSize()).withPage(page - 1);
+        Page<D> results = repository.findAll(spec, pageable).map(buildDisplay);
 
-            String baseUri =
-                    ServletUriComponentsBuilder.fromCurrentRequest()
-                            .replaceQueryParam("page")
-                            .toUriString();
+        String baseUri =
+                ServletUriComponentsBuilder.fromCurrentRequest()
+                        .replaceQueryParam("page")
+                        .toUriString();
 
-            model.addAttribute("page", results);
-            model.addAttribute("baseUri", baseUri);
-            return "search_results";
+        model.addAttribute("page", results);
+        model.addAttribute("baseUri", baseUri);
+        return "search_results";
     }
 }
diff --git a/src/main/resources/static/css/main.css b/src/main/resources/static/css/main.css
index dbc6d67..7587e5f 100644
--- a/src/main/resources/static/css/main.css
+++ b/src/main/resources/static/css/main.css
@@ -30,10 +30,10 @@ span.icon-overlay.bottom-right {
 }
 
 table.recipe-grid-table tr {
-    height: 70px;
+    height: 80px;
 }
 table.recipe-grid-table td {
-    width: 70px;
+    width: 80px;
     text-align: center;
     vertical-align: center;
     border: 1px solid black;