fix: consolidate ingredient choices in ShapelessRecipe

Author: ybw0014

build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     compileOnly(kotlin("stdlib")) // loaded through library loader
     compileOnly(kotlin("reflect")) // loaded through library loader
     compileOnlyAndTestImpl("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
-    compileOnlyAndTestImpl("com.github.Slimefun:Slimefun4:5374034c87")
+    compileOnlyAndTestImpl("com.github.slimefun:Slimefun4:experimental-SNAPSHOT")
     compileOnly("net.guizhanss:SlimefunTranslation:e6da231617")
     compileOnly("com.github.schntgaispock:SlimeHUD:1.3.0")
     compileOnly("com.github.SlimefunGuguProject:InfinityExpansion:bebf0bd0f9")

src/main/kotlin/net/guizhanss/fastmachines/core/recipes/loaders/VanillaRecipeLoader.kt

@@ -4,6 +4,7 @@ package net.guizhanss.fastmachines.core.recipes.loaders
 
 import net.guizhanss.fastmachines.core.recipes.raw.RawRecipe
 import net.guizhanss.fastmachines.implementation.items.machines.base.BaseFastMachine
+import net.guizhanss.fastmachines.utils.consolidate
 import net.guizhanss.fastmachines.utils.items.asFMRecipeChoice
 import net.guizhanss.fastmachines.utils.reflections.resultItem
 import org.bukkit.Bukkit
@@ -52,13 +53,13 @@ class VanillaRecipeLoader<T : Recipe>(
             }
 
             is ShapelessRecipe -> {
-                rawRecipes.add(RawRecipe(recipe.choiceList.map { it.asFMRecipeChoice() }, listOf(recipe.resultItem)))
+                val ingredients = recipe.choiceList.map { it.asFMRecipeChoice() }.consolidate()
+                rawRecipes.add(RawRecipe(ingredients, listOf(recipe.resultItem)))
             }
 
             is CookingRecipe<*> -> {
                 rawRecipes.add(RawRecipe(listOf(recipe.inputChoice.asFMRecipeChoice()), listOf(recipe.result)))
             }
         }
     }
-
 }

src/main/kotlin/net/guizhanss/fastmachines/utils/RecipeChoiceExt.kt

@@ -0,0 +1,48 @@
+package net.guizhanss.fastmachines.utils
+
+import net.guizhanss.fastmachines.core.recipes.choices.ExactChoice
+import net.guizhanss.fastmachines.core.recipes.choices.RecipeChoice
+import kotlin.collections.component1
+import kotlin.collections.component2
+import kotlin.collections.forEach
+
+/**
+ * Consolidate a list of [RecipeChoice] by merging [ExactChoice] with the same item.
+ *
+ * Other types of [RecipeChoice] will remain unchanged.
+ */
+fun List<RecipeChoice>.consolidate(): List<RecipeChoice> {
+    val exactChoices = mutableListOf<ExactChoice>()
+    val otherChoices = mutableListOf<RecipeChoice>()
+
+    this.forEach { choice ->
+        when (choice) {
+            is ExactChoice -> exactChoices.add(choice)
+            else -> otherChoices.add(choice)
+        }
+    }
+
+    val mergedExactChoices = exactChoices.groupBy { it.item }.flatMap { (item, itemChoices) ->
+        val totalAmount = itemChoices.sumOf { it.amount }
+        val maxStackSize = item.baseItem.maxStackSize
+
+        if (totalAmount <= maxStackSize) {
+            listOf(ExactChoice(item, totalAmount))
+        } else {
+            // Split into multiple choices if exceeding max stack size
+            val fullStacks = totalAmount / maxStackSize
+            val remainder = totalAmount % maxStackSize
+
+            buildList {
+                repeat(fullStacks) {
+                    add(ExactChoice(item, maxStackSize))
+                }
+                if (remainder > 0) {
+                    add(ExactChoice(item, remainder))
+                }
+            }
+        }
+    }
+
+    return mergedExactChoices + otherChoices
+}