DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix matter manager recipe finder creating item stacks with infinite cost

Browse Source
This commit is contained in:
DBotThePony 2023-06-18 17:43:23 +07:00
parent 9efad96aff
commit 1c7abed6e9
Signed by: DBot
GPG Key ID: DCC23B5715498507
1 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
View File

@ -546,69 +546,76 @@ object MatterManager {
}
stream.map {
val width: Int
val height: Int
// avoid reality snap when recipe has no output
val resultItem = it.getResultItem(server.registryAccess())
if (it is IShapedRecipe<*>) {
width = it.recipeWidth
height = it.recipeHeight
if (resultItem.isEmpty) {
null
} else {
width = it.ingredients.size
height = 1
}
val width: Int
val height: Int
val container = TransientCraftingContainer(object : AbstractContainerMenu(null, 0) {
override fun quickMoveStack(pPlayer: Player, pIndex: Int): ItemStack {
return ItemStack.EMPTY
if (it is IShapedRecipe<*>) {
width = it.recipeWidth
height = it.recipeHeight
} else {
width = it.ingredients.size
height = 1
}
override fun stillValid(pPlayer: Player): Boolean {
return false
}
}, width, height)
val realIngredients = ArrayList<ArrayList<RecipeEntry>>()
for (c in it.ingredients.indices) {
if (it.ingredients[c].isActuallyEmpty) {
continue
}
for ((i, ingredient) in it.ingredients.withIndex()) {
if (i != c) {
container[i] = if (ingredient.isActuallyEmpty) ItemStack.EMPTY else ingredient.items.firstOrNull() ?: ItemStack.EMPTY
val container = TransientCraftingContainer(object : AbstractContainerMenu(null, 0) {
override fun quickMoveStack(pPlayer: Player, pIndex: Int): ItemStack {
return ItemStack.EMPTY
}
}
val result = ArrayList<RecipeEntry>()
override fun stillValid(pPlayer: Player): Boolean {
return false
}
}, width, height)
for (item in it.ingredients[c].items) {
container[c] = item
val realIngredients = ArrayList<ArrayList<RecipeEntry>>()
if (!it.assemble(container, server.registryAccess()).isEmpty) {
val residue = it.getRemainingItems(container)
for (c in it.ingredients.indices) {
if (it.ingredients[c].isActuallyEmpty) {
continue
}
val thisResidue = residue[c]
if (thisResidue.isEmpty) {
result.add(RecipeEntry(item))
} else {
result.add(RecipeEntry(ImmutableStack(item), ImmutableStack(thisResidue)))
for ((i, ingredient) in it.ingredients.withIndex()) {
if (i != c) {
container[i] = if (ingredient.isActuallyEmpty) ItemStack.EMPTY else ingredient.items.firstOrNull() ?: ItemStack.EMPTY
}
}
val result = ArrayList<RecipeEntry>()
for (item in it.ingredients[c].items) {
container[c] = item
if (!it.assemble(container, server.registryAccess()).isEmpty) {
val residue = it.getRemainingItems(container)
val thisResidue = residue[c]
if (thisResidue.isEmpty) {
result.add(RecipeEntry(item))
} else {
result.add(RecipeEntry(ImmutableStack(item), ImmutableStack(thisResidue)))
}
}
}
realIngredients.add(result)
}
realIngredients.add(result)
ResolvedRecipe(
realIngredients.stream().map { it.stream() },
ImmutableStack(resultItem),
isCritical = isCritical,
name = it.id,
allowBacktrack = allowBacktrack
)
}
ResolvedRecipe(
realIngredients.stream().map { it.stream() },
ImmutableStack(it.getResultItem(server.registryAccess())),
isCritical = isCritical,
name = it.id,
allowBacktrack = allowBacktrack
)
}.filter {
}.filterNotNull().filter {
if (it.inputs.isEmpty()) {
LOGGER.warn("${it.formattedName} with output '${it.output.item.registryName}' ended up with no inputs!")
false
@ -1388,6 +1395,11 @@ object MatterManager {
val item: Item,
val multiplier: Double = 1.0
) {
init {
require(!multiplier.isNaN()) { "Provided stack cost multiplier is NaN" }
require(!multiplier.isInfinite()) { "Provided stack cost multiplier is infinite" }
}
constructor(item: Item, count: Int) : this(item, 1.0 / count.toDouble())
constructor(item: ItemStack) : this(item.item, item.count)
}