AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disassembler won't return buckets in recipes anymore.

Browse Source
This commit is contained in:
Florian Nücke 2014-05-20 00:46:14 +02:00
parent e22cec01e6
commit c28cfa69fc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/li/cil/oc/common/tileentity/Disassembler.scala
View File

@ -6,7 +6,7 @@ import li.cil.oc.api.network.Visibility
import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.server.{PacketSender => ServerPacketSender}
import li.cil.oc.util.ExtendedNBT._ import li.cil.oc.util.ExtendedNBT._
import li.cil.oc.util.{ItemUtils, InventoryUtils} import li.cil.oc.util.{ItemUtils, InventoryUtils}
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{ItemBucket, Item, ItemStack}
import net.minecraft.item.crafting.{ShapelessRecipes, ShapedRecipes, IRecipe, CraftingManager} import net.minecraft.item.crafting.{ShapelessRecipes, ShapedRecipes, IRecipe, CraftingManager}
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import net.minecraftforge.common.ForgeDirection import net.minecraftforge.common.ForgeDirection
@ -119,14 +119,18 @@ class Disassembler extends traits.Environment with traits.Inventory {
case Some(recipe: ShapedOreRecipe) => resolveOreDictEntries(recipe.getInput) case Some(recipe: ShapedOreRecipe) => resolveOreDictEntries(recipe.getInput)
case Some(recipe: ShapelessOreRecipe) => resolveOreDictEntries(recipe.getInput) case Some(recipe: ShapelessOreRecipe) => resolveOreDictEntries(recipe.getInput)
case _ => Iterable.empty case _ => Iterable.empty
}).toArray }).filter(ingredient => ingredient != null &&
// Strip out buckets, because those are returned when crafting, and
// we have no way of returning the fluid only (and I can't be arsed
// to make it output fluids into fluiducts or such, sorry).
!ingredient.getItem.isInstanceOf[ItemBucket]).toArray
// Avoid positive feedback loops. // Avoid positive feedback loops.
if (ingredients.exists(ingredient => ingredient != null && ingredient.isItemEqual(stack))) { if (ingredients.exists(ingredient => ingredient.isItemEqual(stack))) {
return Iterable.empty return Iterable.empty
} }
// Merge equal items for size division by output size. // Merge equal items for size division by output size.
val merged = mutable.ArrayBuffer.empty[ItemStack] val merged = mutable.ArrayBuffer.empty[ItemStack]
for (ingredient <- ingredients if ingredient != null) { for (ingredient <- ingredients) {
merged.find(_.isItemEqual(ingredient)) match { merged.find(_.isItemEqual(ingredient)) match {
case Some(entry) => entry.stackSize += ingredient.stackSize case Some(entry) => entry.stackSize += ingredient.stackSize
case _ => merged += ingredient.copy() case _ => merged += ingredient.copy()