AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-16 10:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

made additional outputs a sequence to allow additional machines

Browse Source 
so these commits should basically close #760
This commit is contained in:
Johannes Lohrer 2015-04-19 20:50:13 +02:00
parent 72a4a0e476
commit f534e1b3b6
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/scala/li/cil/oc/integration/gregtech/RecipeRegistry.scala
View File

@ -13,7 +13,7 @@ import scala.collection.convert.WrapAsScala._
object RecipeRegistry { object RecipeRegistry {
def getGTRecipesWithEU(output: ItemStack, recipe: Config): (Array[ItemStack], Option[Array[ItemStack]], Option[FluidStack], Option[FluidStack], Option[ItemStack], Int, Int) = { def getGTRecipesWithEU(output: ItemStack, recipe: Config): (Array[ItemStack], Option[Array[ItemStack]], Option[FluidStack], Option[FluidStack], Seq[ItemStack], Int, Int) = {
val inputs = (recipe.getValue("input").unwrapped() match { val inputs = (recipe.getValue("input").unwrapped() match {
case list: util.List[AnyRef]@unchecked => list.map(Recipes.parseIngredient) case list: util.List[AnyRef]@unchecked => list.map(Recipes.parseIngredient)
@ -55,11 +55,34 @@ object RecipeRegistry {
val eu = recipe.getInt("eu") val eu = recipe.getInt("eu")
val duration = recipe.getInt("time") val duration = recipe.getInt("time")
var additionalOutput = Seq.empty[ItemStack]
if(recipe.hasPath("additionalOutput"))
{
additionalOutput = (recipe.getValue("additionalOutput").unwrapped() match {
case list: util.List[AnyRef]@unchecked => list.map(Recipes.parseIngredient)
case other => Seq(Recipes.parseIngredient(other))
}) map {
case stack: ItemStack => stack
case name: String => val ores = OreDictionary.getOres(name)
if(ores.size()>0)
ores.get(0)
else
null
case other => throw new RecipeException(s"Invalid ingredient type: $other.")
}
val outputCount = recipe.getIntList("outputCount")
if (outputCount.size() != additionalOutput.size) {
throw new RecipeException(s"Outputs and output count mismatch: ${additionalOutput.size} != ${outputCount.size}.")
}
(additionalOutput, outputCount).zipped.foreach((stack, count) => if (stack != null && count > 0) stack.stackSize = stack.getMaxStackSize min count)
}
//TODO add output
val additionalOutput: Option[ItemStack] = None
(inputs, inputCount).zipped.foreach((stacks, count) => stacks.foreach(stack => if (stack != null && count > 0) stack.stackSize = stack.getMaxStackSize min count)) (inputs, inputCount).zipped.foreach((stacks, count) => stacks.foreach(stack => if (stack != null && count > 0) stack.stackSize = stack.getMaxStackSize min count))
inputs.padTo(2, null) inputs.padTo(2, null)
val input = inputs.head val input = inputs.head
(input, Option(inputs.last), inputFluidStack, outputFluidStack, additionalOutput, eu, duration) (input, Option(inputs.last), inputFluidStack, outputFluidStack, additionalOutput, eu, duration)
@ -113,10 +136,8 @@ object RecipeRegistry {
def addGTCutterRecipe(output: ItemStack, recipe: Config) { def addGTCutterRecipe(output: ItemStack, recipe: Config) {
val (inputs1, inputs2, fluidStackIn, fluidStackOut, additionalOutput, eu, duration) = getGTRecipesWithEU(output, recipe) val (inputs1, inputs2, fluidStackIn, fluidStackOut, additionalOutput, eu, duration) = getGTRecipesWithEU(output, recipe)
var add :ItemStack = null var add :ItemStack = null
additionalOutput match{ if(additionalOutput.size>1)
case Some(a) => add = a add = additionalOutput.head
case _=>
}
for (input1 <- inputs1) { for (input1 <- inputs1) {
fluidStackIn match { fluidStackIn match {
case Some(fluid) => case Some(fluid) =>
@ -131,10 +152,9 @@ object RecipeRegistry {
def addGTCannerRecipe(output: ItemStack, recipe: Config) { def addGTCannerRecipe(output: ItemStack, recipe: Config) {
val (inputs1, inputs2, fluidStackIn, fluidStackOut, additionalOutput, eu, duration) = getGTRecipesWithEU(output, recipe) val (inputs1, inputs2, fluidStackIn, fluidStackOut, additionalOutput, eu, duration) = getGTRecipesWithEU(output, recipe)
var add :ItemStack = null var add :ItemStack = null
additionalOutput match{ if(additionalOutput.size>1)
case Some(a) => add = a add = additionalOutput.head
case _=>
}
for (input1 <- inputs1) { for (input1 <- inputs1) {
inputs2 match { inputs2 match {
case Some(inputs2List) => case Some(inputs2List) =>
@ -204,10 +224,8 @@ object RecipeRegistry {
def addGTLatheRecipe(output: ItemStack, recipe: Config) { def addGTLatheRecipe(output: ItemStack, recipe: Config) {
val (inputs1, inputs2, fluidStackIn, fluidStackOut, additionalOutput, eu, duration) = getGTRecipesWithEU(output, recipe) val (inputs1, inputs2, fluidStackIn, fluidStackOut, additionalOutput, eu, duration) = getGTRecipesWithEU(output, recipe)
var add :ItemStack = null var add :ItemStack = null
additionalOutput match{ if(additionalOutput.size>1)
case Some(a) => add = a add = additionalOutput.head
case _=>
}
for (input1 <- inputs1) { for (input1 <- inputs1) {
gregtech.api.GregTech_API.sRecipeAdder.addLatheRecipe(input1, output, add, duration, eu) gregtech.api.GregTech_API.sRecipeAdder.addLatheRecipe(input1, output, add, duration, eu)
} }