From 322e60f571bb208824e9bb545ecc236776e2bf72 Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 26 Jan 2014 16:04:45 +0100 Subject: [PATCH 1/3] Well, this is German grammar! (Updated de_DE.lang) --- assets/opencomputers/lang/de_DE.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/opencomputers/lang/de_DE.lang b/assets/opencomputers/lang/de_DE.lang index 9c953153d..de5a1508b 100644 --- a/assets/opencomputers/lang/de_DE.lang +++ b/assets/opencomputers/lang/de_DE.lang @@ -81,7 +81,7 @@ oc:gui.Chat.WarningProjectRed=Die verwendete Version von Project: Red ist nicht oc:gui.Error.ComponentOverflow=Zu viele Komponenten sind mit dem Computer verbunden. oc:gui.Error.DaylightCycle=Computer funktionieren nicht, solange die Zeit angehalten ist (Spielregel doDaylightCycle ist aus). oc:gui.Error.InternalError=Interner Fehler, bitte sieh in der Logdatei nach. Das ist wahrscheinlich ein Bug. -oc:gui.Error.NoCPU=Im Computer ist keine CPU installiert. +oc:gui.Error.NoCPU=Im Computer ist kein CPU installiert. oc:gui.Error.NoEnergy=Nicht genug Energie. oc:gui.Error.NoRAM=Im Computer ist kein RAM installiert. oc:gui.Error.OutOfMemory=Nicht genug Arbeitsspeicher. From 6e27dc180377d47a3d7ea28e60b12f1167dc49f1 Mon Sep 17 00:00:00 2001 From: Johannes Lohrer Date: Sun, 26 Jan 2014 17:05:20 +0100 Subject: [PATCH 2/3] changed PCB in gregtech recipe to use sulfuric acid instead of grog don't display items with recipe output 0 in item list --- assets/opencomputers/recipes/gregtech.recipes | 5 ++--- li/cil/oc/Recipes.scala | 16 ++++++++++++++-- li/cil/oc/common/item/AbstractBusCard.scala | 2 +- li/cil/oc/common/item/Delegate.scala | 2 +- li/cil/oc/common/item/IronNugget.scala | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/assets/opencomputers/recipes/gregtech.recipes b/assets/opencomputers/recipes/gregtech.recipes index 4720a8c64..7a06afd39 100644 --- a/assets/opencomputers/recipes/gregtech.recipes +++ b/assets/opencomputers/recipes/gregtech.recipes @@ -113,8 +113,7 @@ cuttingWire { } acid { type: shapeless - input: [bucketWater, dustEmerald, fermentedSpiderEye, slimeball] - output: 4 + output: 0 } disk { input: [["", plateAluminium, ""] @@ -197,7 +196,7 @@ circuitBoard { } printedCircuitBoard { type:shaped - input: [[dustTinyGold, "oc:craftingAcid"] + input: [[dustTinyGold, {item=item.GT_Cells, subID=40}] ["oc:craftingCircuitBoard", dustTinyGold]] } card { diff --git a/li/cil/oc/Recipes.scala b/li/cil/oc/Recipes.scala index a20a9e204..94416b2eb 100644 --- a/li/cil/oc/Recipes.scala +++ b/li/cil/oc/Recipes.scala @@ -14,6 +14,7 @@ import org.apache.commons.io.FileUtils import scala.Some import scala.collection.convert.wrapAsScala._ import scala.collection.mutable.ArrayBuffer +import li.cil.oc.common.item.Delegate object Recipes { def init() { @@ -187,8 +188,14 @@ object Recipes { shape += pattern.toString input ++= ingredients } - - GameRegistry.addRecipe(new ShapedOreRecipe(output, shape ++ input: _*)) + if (input.size > 0 && output.stackSize > 0) { + GameRegistry.addRecipe(new ShapedOreRecipe(output, shape ++ input: _*)) + } else { + Items.multi.subItem(output) match { + case Some(stack) => stack.showInItemList = false + case _ => + } + } } private def addShapelessRecipe(output: ItemStack, recipe: Config) { @@ -200,6 +207,11 @@ object Recipes { if (input.size > 0 && output.stackSize > 0) { GameRegistry.addRecipe(new ShapelessOreRecipe(output, input: _*)) + } else { + Items.multi.subItem(output) match { + case Some(stack) => stack.showInItemList = false + case _ => + } } } diff --git a/li/cil/oc/common/item/AbstractBusCard.scala b/li/cil/oc/common/item/AbstractBusCard.scala index 6d3aba644..8340c2626 100644 --- a/li/cil/oc/common/item/AbstractBusCard.scala +++ b/li/cil/oc/common/item/AbstractBusCard.scala @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack class AbstractBusCard(val parent: Delegator) extends Delegate { val unlocalizedName = "AbstractBusCard" - override val showInItemList = Loader.isModLoaded("StargateTech2") + showInItemList = Loader.isModLoaded("StargateTech2") override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) { tooltip.addAll(Tooltip.get(unlocalizedName)) diff --git a/li/cil/oc/common/item/Delegate.scala b/li/cil/oc/common/item/Delegate.scala index 575120392..4d4083a51 100644 --- a/li/cil/oc/common/item/Delegate.scala +++ b/li/cil/oc/common/item/Delegate.scala @@ -13,7 +13,7 @@ trait Delegate { val unlocalizedName: String - val showInItemList = true + var showInItemList = true val itemId = parent.add(this) diff --git a/li/cil/oc/common/item/IronNugget.scala b/li/cil/oc/common/item/IronNugget.scala index e93d79685..5731238af 100644 --- a/li/cil/oc/common/item/IronNugget.scala +++ b/li/cil/oc/common/item/IronNugget.scala @@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack class IronNugget(val parent: Delegator) extends Delegate { val unlocalizedName = "IronNugget" - override val showInItemList = !Loader.isModLoaded("gregtech_addon") + showInItemList = !Loader.isModLoaded("gregtech_addon") override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) { tooltip.addAll(Tooltip.get(unlocalizedName)) From a2d4eb87af2565df49c3a920811a7ab7adf47e4a Mon Sep 17 00:00:00 2001 From: Vexatos Date: Sun, 26 Jan 2014 17:19:25 +0100 Subject: [PATCH 3/3] Update de_DE.lang --- assets/opencomputers/lang/de_DE.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/opencomputers/lang/de_DE.lang b/assets/opencomputers/lang/de_DE.lang index de5a1508b..3b990a61f 100644 --- a/assets/opencomputers/lang/de_DE.lang +++ b/assets/opencomputers/lang/de_DE.lang @@ -81,7 +81,7 @@ oc:gui.Chat.WarningProjectRed=Die verwendete Version von Project: Red ist nicht oc:gui.Error.ComponentOverflow=Zu viele Komponenten sind mit dem Computer verbunden. oc:gui.Error.DaylightCycle=Computer funktionieren nicht, solange die Zeit angehalten ist (Spielregel doDaylightCycle ist aus). oc:gui.Error.InternalError=Interner Fehler, bitte sieh in der Logdatei nach. Das ist wahrscheinlich ein Bug. -oc:gui.Error.NoCPU=Im Computer ist kein CPU installiert. +oc:gui.Error.NoCPU=Im Computer ist kein Hauptprozessor (CPU) installiert. oc:gui.Error.NoEnergy=Nicht genug Energie. oc:gui.Error.NoRAM=Im Computer ist kein RAM installiert. oc:gui.Error.OutOfMemory=Nicht genug Arbeitsspeicher.