Merge remote-tracking branch 'origin/architectury/1.21' into architec…

…tury/1.21
fzzyhmstrs · Feb 2, 2025 · e8de789 · e8de789
2 parents f388197 + 7b003e6
commit e8de789
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/xplat/src/main/java/fzzyhmstrs/emi_loot/emi/MobLootRecipe.java b/xplat/src/main/java/fzzyhmstrs/emi_loot/emi/MobLootRecipe.java
@@ -96,7 +96,12 @@ public MobLootRecipe(ClientMobLootTable loot) {
                 builtPool.stacks().forEach(cs -> {
                     list.addAll(cs.ingredient());
                 });
-                addWidgetBuilders(builtPool, false);
+                try {
+                    addWidgetBuilders(builtPool, false);
+                } catch (Throwable e) {
+                    EmiLoot.LOGGER.error("Error encountered while preparing layout for mob recipe {}, display may be incomplete.", loot.id);
+                    e.printStackTrace();
+                }
             }
         );
         outputStacks = list;
@@ -109,26 +114,21 @@ public MobLootRecipe(ClientMobLootTable loot) {
     private final EntityType<?> type;
     @Nullable
     private final EmiStack egg;
-    private final List<WidgetRowBuilder> rowBuilderList = new LinkedList<>();
+    private final List<WidgetRowBuilder> rowBuilderList = new ArrayList<>();
 
     private void addWidgetBuilders(ClientBuiltPool newPool, boolean recursive) {
         if (recursive || rowBuilderList.isEmpty()) {
             rowBuilderList.add(new WidgetRowBuilder(154));
         }
-        boolean added = false;
         for (WidgetRowBuilder builder : rowBuilderList) {
             if (builder.canAddPool(newPool)) {
                 builder.addAndTrim(newPool);
-                added = true;
-                break;
+                return;
             }
         }
-        if (!added) {
-            Optional<ClientBuiltPool> opt = rowBuilderList.get(rowBuilderList.size() - 1).addAndTrim(newPool);
-            opt.ifPresent(clientMobBuiltPool -> addWidgetBuilders(clientMobBuiltPool, true));
-        }
-
-
+        Optional<ClientBuiltPool> opt = rowBuilderList.get(rowBuilderList.size() - 1).addAndTrim(newPool);
+        if (opt.isEmpty()) return;
+        addWidgetBuilders(opt.get(), true);
     }
 
     @Override
@@ -294,4 +294,4 @@ public boolean supportsRecipeTree() {
     public boolean hideCraftable() {
         return EmiRecipe.super.hideCraftable();
     }
-}
+}