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

ore dictionary for poison

Browse Source
This commit is contained in:
Johannes Lohrer 2013-12-01 01:27:00 +01:00
parent 012a4bd12b
commit 96629ece3a
5 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,7 @@ oc:item.NetworkCard.name=Netzwerkkarte
oc:item.RedstoneCard.name=Redstonekarte oc:item.RedstoneCard.name=Redstonekarte
oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte oc:item.WirelessNetworkCard.name=Drahtlosnetzwerkkarte
oc:item.IronNugget.name=Eisennugget oc:item.IronNugget.name=Eisennugget
oc:item.RawCircuitBoard.name=Rohe Basis Platte
oc:item.CircuitBoard.name=Basis Platte oc:item.CircuitBoard.name=Basis Platte
oc:item.PrintedCircuitBoard.name=Leiterplatte (PCB) oc:item.PrintedCircuitBoard.name=Leiterplatte (PCB)
oc:item.NumPad.name=Ziffernblock oc:item.NumPad.name=Ziffernblock

1
assets/opencomputers/lang/en_US.lang
View File

@ -35,6 +35,7 @@ oc:item.NetworkCard.name=Network Card
oc:item.RedstoneCard.name=Redstone Card oc:item.RedstoneCard.name=Redstone Card
oc:item.WirelessNetworkCard.name=Wireless Network Card oc:item.WirelessNetworkCard.name=Wireless Network Card
oc:item.IronNugget.name=Iron Nugget oc:item.IronNugget.name=Iron Nugget
oc:item.RawCircuitBoard.name=Raw Circuit Board
oc:item.CircuitBoard.name=Circuit Board oc:item.CircuitBoard.name=Circuit Board
oc:item.PrintedCircuitBoard.name=Printed Circuit Board(PCB) oc:item.PrintedCircuitBoard.name=Printed Circuit Board(PCB)
oc:item.NumPad.name=Numeric Keypad oc:item.NumPad.name=Numeric Keypad

19
li/cil/oc/Items.scala
View File

@ -2,7 +2,7 @@ package li.cil.oc
import cpw.mods.fml.common.registry.GameRegistry import cpw.mods.fml.common.registry.GameRegistry
import li.cil.oc.common.item import li.cil.oc.common.item
import net.minecraft.item.ItemStack import net.minecraft.item.{Item, ItemStack}
import net.minecraftforge.oredict.OreDictionary import net.minecraftforge.oredict.OreDictionary
object Items { object Items {
@ -44,11 +44,12 @@ object Items {
var arrowKeys: item.ArrowKeys = null var arrowKeys: item.ArrowKeys = null
var buttonGroup: item.ButtonGroup = null var buttonGroup: item.ButtonGroup = null
var cpu: item.CPU = null var cpu: item.CPU = null
var transistor : item.Transistor = null var transistor: item.Transistor = null
var alu : item.ALU = null var alu: item.ALU = null
var cu : item.ControlUnit = null var cu: item.ControlUnit = null
var ironNugget : item.IronNugget = null var ironNugget: item.IronNugget = null
var rawCircuitBoard: item.RawCircuitBoard = null
def init() { def init() {
@ -96,5 +97,13 @@ object Items {
ironNugget = new item.IronNugget(multi) ironNugget = new item.IronNugget(multi)
OreDictionary.registerOre("nuggetIron", ironNugget.createItemStack()) OreDictionary.registerOre("nuggetIron", ironNugget.createItemStack())
OreDictionary.registerOre("potionPoison", new ItemStack(Item.potion, 1, 8196))
OreDictionary.registerOre("potionPoison", new ItemStack(Item.potion, 1, 8228))
OreDictionary.registerOre("potionPoison", new ItemStack(Item.potion, 1, 8260))
OreDictionary.registerOre("potionPoison", new ItemStack(Item.potion, 1, 16388))
OreDictionary.registerOre("potionPoison", new ItemStack(Item.potion, 1, 16420))
OreDictionary.registerOre("potionPoison", new ItemStack(Item.potion, 1, 16452))
rawCircuitBoard = new item.RawCircuitBoard(multi)
} }
} }

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

@ -4,16 +4,20 @@ import cpw.mods.fml.common.registry.GameRegistry
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.item.{Item, ItemStack} import net.minecraft.item.{Item, ItemStack}
import net.minecraftforge.oredict.{ShapelessOreRecipe, ShapedOreRecipe, OreDictionary} import net.minecraftforge.oredict.{ShapelessOreRecipe, ShapedOreRecipe, OreDictionary}
import net.minecraft.item.crafting.FurnaceRecipes
object Recipes { object Recipes {
def init() { def init() {
val ironStack = new ItemStack(Item.ingotIron) val ironStack = new ItemStack(Item.ingotIron)
val dirt = new ItemStack(Block.dirt) val dirt = new ItemStack(Block.dirt)
val lapis = new ItemStack(Item.dyePowder, 1, 4) val lapis = new ItemStack(Item.dyePowder, 1, 4)
val cactusGreen = new ItemStack(Item.dyePowder, 1, 4)
val diamond = new ItemStack(Item.diamond) val diamond = new ItemStack(Item.diamond)
val glowstoneDust = new ItemStack(Item.glowstone) val glowstoneDust = new ItemStack(Item.glowstone)
val redstoneDust = new ItemStack(Item.redstone) val redstoneDust = new ItemStack(Item.redstone)
val redstoneTorch = new ItemStack(Block.torchRedstoneIdle)
val comparator = new ItemStack(Item.comparator) val comparator = new ItemStack(Item.comparator)
val repeater = new ItemStack(Item.redstoneRepeater)
val emerald = new ItemStack(Item.emerald) val emerald = new ItemStack(Item.emerald)
val goldNugget = new ItemStack(Item.goldNugget) val goldNugget = new ItemStack(Item.goldNugget)
@ -22,6 +26,8 @@ object Recipes {
val chip2 = Items.chip2.createItemStack() val chip2 = Items.chip2.createItemStack()
val chip3 = Items.chip3.createItemStack() val chip3 = Items.chip3.createItemStack()
val transistor = Items.transistor.createItemStack() val transistor = Items.transistor.createItemStack()
val circuitBoard =Items.circuitBoardBody.createItemStack()
val rawCircuitBoard =Items.rawCircuitBoard.createItemStack()
GameRegistry.addRecipe(Blocks.adapter.createItemStack(), GameRegistry.addRecipe(Blocks.adapter.createItemStack(),
"x ", "x ",
@ -184,10 +190,10 @@ object Recipes {
"xxx", "xxx",
"xxx", 'x': Character, new ItemStack(Block.stoneButton)) "xxx", 'x': Character, new ItemStack(Block.stoneButton))
addRecipe(Items.transistor.createItemStack(), addRecipe(transistor,
" d ", "ttt",
"drd", "drd",
" t ", 'r', new ItemStack(Item.redstoneRepeater), 'd', new ItemStack(Item.redstone), 't', new ItemStack(Block.torchRedstoneIdle)) " d ", 'r',repeater , 'd', redstoneDust, 't', redstoneTorch)
addRecipe(Items.cpu.createItemStack(), addRecipe(Items.cpu.createItemStack(),
"brb", "brb",
@ -226,13 +232,9 @@ object Recipes {
GameRegistry.addShapelessRecipe(Items.ironCutter.createItemStack(16), new ItemStack(Item.shears, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Item.ingotIron)) GameRegistry.addShapelessRecipe(Items.ironCutter.createItemStack(16), new ItemStack(Item.shears, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Item.ingotIron))
GameRegistry.addShapelessRecipe(Items.circuitBoardBody.createItemStack(), Items.ironCutter.createItemStack(), new ItemStack(Block.hardenedClay)) GameRegistry.addShapelessRecipe(rawCircuitBoard, Items.ironCutter.createItemStack(), new ItemStack(Block.blockClay),cactusGreen)
GameRegistry.addShapelessRecipe(Items.circuitBoard.createItemStack(), new ItemStack(Item.potion, 1, 8196), Item.goldNugget, Items.circuitBoardBody.createItemStack()) FurnaceRecipes.smelting().addSmelting(rawCircuitBoard.itemID,rawCircuitBoard.getItemDamage,circuitBoard,1)
GameRegistry.addShapelessRecipe(Items.circuitBoard.createItemStack(), new ItemStack(Item.potion, 1, 8228), Item.goldNugget, Items.circuitBoardBody.createItemStack()) GameRegistry.addRecipe(new ShapelessOreRecipe(Items.circuitBoard.createItemStack(), "potionPoison", Item.goldNugget, circuitBoard))
GameRegistry.addShapelessRecipe(Items.circuitBoard.createItemStack(), new ItemStack(Item.potion, 1, 8260), Item.goldNugget, Items.circuitBoardBody.createItemStack())
GameRegistry.addShapelessRecipe(Items.circuitBoard.createItemStack(), new ItemStack(Item.potion, 1, 16388), Item.goldNugget, Items.circuitBoardBody.createItemStack())
GameRegistry.addShapelessRecipe(Items.circuitBoard.createItemStack(), new ItemStack(Item.potion, 1, 16420), Item.goldNugget, Items.circuitBoardBody.createItemStack())
GameRegistry.addShapelessRecipe(Items.circuitBoard.createItemStack(), new ItemStack(Item.potion, 1, 16452), Item.goldNugget, Items.circuitBoardBody.createItemStack())
GameRegistry.addShapelessRecipe(new ItemStack(Item.potion), Item.bucketWater, Item.glassBottle) GameRegistry.addShapelessRecipe(new ItemStack(Item.potion), Item.bucketWater, Item.glassBottle)
GameRegistry.addRecipe(new ShapelessOreRecipe(Items.ironNugget.createItemStack(9), ironStack)) GameRegistry.addRecipe(new ShapelessOreRecipe(Items.ironNugget.createItemStack(9), ironStack))
} }

5
li/cil/oc/common/item/RawCircuitBoard.scala Normal file
View File

@ -0,0 +1,5 @@
package li.cil.oc.common.item
class RawCircuitBoard (val parent: Delegator) extends Delegate {
val unlocalizedName = "RawCircuitBoard"
}