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

Merge branch 'master' of https://github.com/MightyPirates/OpenComputers

Browse Source
This commit is contained in:
Florian Nücke 2014-01-26 19:07:52 +01:00
commit b8a448687c
6 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/opencomputers/lang/de_DE.lang
View File

@ -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.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.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.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 Hauptprozessor (CPU) installiert.
oc:gui.Error.NoEnergy=Nicht genug Energie. oc:gui.Error.NoEnergy=Nicht genug Energie.
oc:gui.Error.NoRAM=Im Computer ist kein RAM installiert. oc:gui.Error.NoRAM=Im Computer ist kein RAM installiert.
oc:gui.Error.OutOfMemory=Nicht genug Arbeitsspeicher. oc:gui.Error.OutOfMemory=Nicht genug Arbeitsspeicher.

5
assets/opencomputers/recipes/gregtech.recipes
View File

@ -113,8 +113,7 @@ cuttingWire {
} }
acid { acid {
type: shapeless type: shapeless
input: [bucketWater, dustEmerald, fermentedSpiderEye, slimeball] output: 0
output: 4
} }
disk { disk {
input: [["", plateAluminium, ""] input: [["", plateAluminium, ""]
@ -197,7 +196,7 @@ circuitBoard {
} }
printedCircuitBoard { printedCircuitBoard {
type:shaped type:shaped
input: [[dustTinyGold, "oc:craftingAcid"] input: [[dustTinyGold, {item=item.GT_Cells, subID=40}]
["oc:craftingCircuitBoard", dustTinyGold]] ["oc:craftingCircuitBoard", dustTinyGold]]
} }
card { card {

16
li/cil/oc/Recipes.scala
View File

@ -14,6 +14,7 @@ import org.apache.commons.io.FileUtils
import scala.Some import scala.Some
import scala.collection.convert.wrapAsScala._ import scala.collection.convert.wrapAsScala._
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
import li.cil.oc.common.item.Delegate
object Recipes { object Recipes {
def init() { def init() {
@ -187,8 +188,14 @@ object Recipes {
shape += pattern.toString shape += pattern.toString
input ++= ingredients input ++= ingredients
} }
if (input.size > 0 && output.stackSize > 0) {
GameRegistry.addRecipe(new ShapedOreRecipe(output, shape ++ input: _*)) 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) { private def addShapelessRecipe(output: ItemStack, recipe: Config) {
@ -200,6 +207,11 @@ object Recipes {
if (input.size > 0 && output.stackSize > 0) { if (input.size > 0 && output.stackSize > 0) {
GameRegistry.addRecipe(new ShapelessOreRecipe(output, input: _*)) GameRegistry.addRecipe(new ShapelessOreRecipe(output, input: _*))
} else {
Items.multi.subItem(output) match {
case Some(stack) => stack.showInItemList = false
case _ =>
}
} }
} }

2
li/cil/oc/common/item/AbstractBusCard.scala
View File

@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack
class AbstractBusCard(val parent: Delegator) extends Delegate { class AbstractBusCard(val parent: Delegator) extends Delegate {
val unlocalizedName = "AbstractBusCard" 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) { override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) {
tooltip.addAll(Tooltip.get(unlocalizedName)) tooltip.addAll(Tooltip.get(unlocalizedName))

2
li/cil/oc/common/item/Delegate.scala
View File

@ -13,7 +13,7 @@ trait Delegate {
val unlocalizedName: String val unlocalizedName: String
val showInItemList = true var showInItemList = true
val itemId = parent.add(this) val itemId = parent.add(this)

2
li/cil/oc/common/item/IronNugget.scala
View File

@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack
class IronNugget(val parent: Delegator) extends Delegate { class IronNugget(val parent: Delegator) extends Delegate {
val unlocalizedName = "IronNugget" 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) { override def tooltipLines(stack: ItemStack, player: EntityPlayer, tooltip: util.List[String], advanced: Boolean) {
tooltip.addAll(Tooltip.get(unlocalizedName)) tooltip.addAll(Tooltip.get(unlocalizedName))