mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-18 11:48:02 -04:00
This is now a one-way street.
This commit is contained in:
parent
7c8b886527
commit
399e0f44e6
@ -67,7 +67,7 @@ item.oc.DataCard1.name=Data Card (Tier 2)
|
|||||||
item.oc.DataCard2.name=Data Card (Tier 3)
|
item.oc.DataCard2.name=Data Card (Tier 3)
|
||||||
item.oc.DebugCard.name=Debug Card
|
item.oc.DebugCard.name=Debug Card
|
||||||
item.oc.Debugger.name=Network Debugger
|
item.oc.Debugger.name=Network Debugger
|
||||||
item.oc.DiamondNugget.name=Diamond Nugget
|
item.oc.DiamondChip.name=Diamond Chip
|
||||||
item.oc.Disk.name=Disk Platter
|
item.oc.Disk.name=Disk Platter
|
||||||
item.oc.DiskDriveMountable.name=Disk Drive
|
item.oc.DiskDriveMountable.name=Disk Drive
|
||||||
item.oc.Drone.name=Drone
|
item.oc.Drone.name=Drone
|
||||||
@ -278,7 +278,7 @@ oc:tooltip.DataCard1=Provides a couple of advanced algorithms such as hashing, A
|
|||||||
oc:tooltip.DataCard2=Provides a couple of advanced algorithms such as hashing, AES encryption, elliptic curve cryptography and deflate/inflate.
|
oc:tooltip.DataCard2=Provides a couple of advanced algorithms such as hashing, AES encryption, elliptic curve cryptography and deflate/inflate.
|
||||||
oc:tooltip.DebugCard=Creative mode item, allows manipulating the world to make testing easier. Use at your own peril.
|
oc:tooltip.DebugCard=Creative mode item, allows manipulating the world to make testing easier. Use at your own peril.
|
||||||
oc:tooltip.Debugger=Can be used to output debug information on OC's internal network grid. Only use if so instructed by a dev.
|
oc:tooltip.Debugger=Can be used to output debug information on OC's internal network grid. Only use if so instructed by a dev.
|
||||||
oc:tooltip.DiamondNugget=A small piece of a once radiant diamond. The pieces fit together flawlessly.
|
oc:tooltip.DiamondChip=A small piece of a once radiant diamond. It will never be the same again.
|
||||||
oc:tooltip.Disassembler=Separates items into their original components. §lWarning§7: returned items have a %s%% chance of breaking in the process!
|
oc:tooltip.Disassembler=Separates items into their original components. §lWarning§7: returned items have a %s%% chance of breaking in the process!
|
||||||
oc:tooltip.Disk=Primitive medium that can be used to build persistent storage devices.
|
oc:tooltip.Disk=Primitive medium that can be used to build persistent storage devices.
|
||||||
oc:tooltip.DiskDrive.CC=ComputerCraft floppies are §asupported§7.
|
oc:tooltip.DiskDrive.CC=ComputerCraft floppies are §asupported§7.
|
||||||
|
@ -169,7 +169,7 @@ dataCard2 {
|
|||||||
["", "oc:materialCard", ""]]
|
["", "oc:materialCard", ""]]
|
||||||
}
|
}
|
||||||
dataCard3 {
|
dataCard3 {
|
||||||
input: [[nuggetDiamond, "oc:cpu2", "oc:ram5"]
|
input: [[chipDiamond, "oc:cpu2", "oc:ram5"]
|
||||||
["", "oc:materialCard", ""]]
|
["", "oc:materialCard", ""]]
|
||||||
}
|
}
|
||||||
graphicsCard1 {
|
graphicsCard1 {
|
||||||
@ -237,7 +237,7 @@ batteryUpgrade2 {
|
|||||||
}
|
}
|
||||||
batteryUpgrade3 {
|
batteryUpgrade3 {
|
||||||
input: [[nuggetIron, "oc:capacitor", nuggetIron]
|
input: [[nuggetIron, "oc:capacitor", nuggetIron]
|
||||||
["oc:capacitor", nuggetDiamond, "oc:capacitor"]
|
["oc:capacitor", chipDiamond, "oc:capacitor"]
|
||||||
[nuggetIron, "oc:capacitor", nuggetIron]]
|
[nuggetIron, "oc:capacitor", nuggetIron]]
|
||||||
}
|
}
|
||||||
chunkloaderUpgrade {
|
chunkloaderUpgrade {
|
||||||
@ -380,20 +380,17 @@ nuggetIron {
|
|||||||
output: 9
|
output: 9
|
||||||
}
|
}
|
||||||
ingotIron {
|
ingotIron {
|
||||||
input: [[nuggetIron, nuggetIron, nuggetIron],
|
type: shapeless
|
||||||
[nuggetIron, nuggetIron, nuggetIron],
|
input: [nuggetIron, nuggetIron, nuggetIron,
|
||||||
[nuggetIron, nuggetIron, nuggetIron]]
|
nuggetIron, nuggetIron, nuggetIron,
|
||||||
|
nuggetIron, nuggetIron, nuggetIron]
|
||||||
}
|
}
|
||||||
nuggetDiamond {
|
chipDiamond {
|
||||||
type: shapeless
|
type: shapeless
|
||||||
input: gemDiamond
|
input: gemDiamond
|
||||||
output: 9
|
output: 6
|
||||||
}
|
|
||||||
gemDiamond {
|
|
||||||
input: [[nuggetDiamond, nuggetDiamond, nuggetDiamond],
|
|
||||||
[nuggetDiamond, nuggetDiamond, nuggetDiamond],
|
|
||||||
[nuggetDiamond, nuggetDiamond, nuggetDiamond]]
|
|
||||||
}
|
}
|
||||||
|
gemDiamond = false
|
||||||
|
|
||||||
cuttingWire = false
|
cuttingWire = false
|
||||||
acid {
|
acid {
|
||||||
@ -465,9 +462,9 @@ chip2 {
|
|||||||
output: 4
|
output: 4
|
||||||
}
|
}
|
||||||
chip3 {
|
chip3 {
|
||||||
input: [[nuggetDiamond, nuggetDiamond, nuggetDiamond]
|
input: [[chipDiamond, chipDiamond, chipDiamond]
|
||||||
[redstone, "oc:materialTransistor", redstone]
|
[redstone, "oc:materialTransistor", redstone]
|
||||||
[nuggetDiamond, nuggetDiamond, nuggetDiamond]]
|
[chipDiamond, chipDiamond, chipDiamond]]
|
||||||
output: 2
|
output: 2
|
||||||
}
|
}
|
||||||
alu {
|
alu {
|
||||||
@ -481,9 +478,9 @@ apu1 {
|
|||||||
[nuggetGold, "oc:circuitChip1", nuggetGold]]
|
[nuggetGold, "oc:circuitChip1", nuggetGold]]
|
||||||
}
|
}
|
||||||
apu2 {
|
apu2 {
|
||||||
input: [[nuggetDiamond, "oc:circuitChip2", nuggetDiamond]
|
input: [[chipDiamond, "oc:circuitChip2", chipDiamond]
|
||||||
["oc:cpu3", "oc:componentBus2", "oc:graphicsCard2"]
|
["oc:cpu3", "oc:componentBus2", "oc:graphicsCard2"]
|
||||||
[nuggetDiamond, "oc:circuitChip2", nuggetDiamond]]
|
[chipDiamond, "oc:circuitChip2", chipDiamond]]
|
||||||
}
|
}
|
||||||
componentBus1 {
|
componentBus1 {
|
||||||
input: [[nuggetIron, redstone, nuggetIron]
|
input: [[nuggetIron, redstone, nuggetIron]
|
||||||
@ -496,9 +493,9 @@ componentBus2 {
|
|||||||
[nuggetGold, "oc:materialCircuitBoardPrinted", nuggetGold]]
|
[nuggetGold, "oc:materialCircuitBoardPrinted", nuggetGold]]
|
||||||
}
|
}
|
||||||
componentBus3 {
|
componentBus3 {
|
||||||
input: [[nuggetDiamond, redstone, nuggetDiamond]
|
input: [[chipDiamond, redstone, chipDiamond]
|
||||||
["oc:circuitChip3", "oc:materialCU", ""]
|
["oc:circuitChip3", "oc:materialCU", ""]
|
||||||
[nuggetDiamond, "oc:materialCircuitBoardPrinted", nuggetDiamond]]
|
[chipDiamond, "oc:materialCircuitBoardPrinted", chipDiamond]]
|
||||||
}
|
}
|
||||||
cpu1 {
|
cpu1 {
|
||||||
input: [[nuggetIron, redstone, nuggetIron]
|
input: [[nuggetIron, redstone, nuggetIron]
|
||||||
@ -511,9 +508,9 @@ cpu2 {
|
|||||||
[nuggetGold, "oc:materialALU", nuggetGold]]
|
[nuggetGold, "oc:materialALU", nuggetGold]]
|
||||||
}
|
}
|
||||||
cpu3 {
|
cpu3 {
|
||||||
input: [[nuggetDiamond, redstone, nuggetDiamond]
|
input: [[chipDiamond, redstone, chipDiamond]
|
||||||
["oc:circuitChip3", "oc:materialCU", "oc:circuitChip3"]
|
["oc:circuitChip3", "oc:materialCU", "oc:circuitChip3"]
|
||||||
[nuggetDiamond, "oc:materialALU", nuggetDiamond]]
|
[chipDiamond, "oc:materialALU", chipDiamond]]
|
||||||
}
|
}
|
||||||
cu {
|
cu {
|
||||||
input: [[nuggetGold, redstone, nuggetGold]
|
input: [[nuggetGold, redstone, nuggetGold]
|
||||||
@ -601,7 +598,7 @@ geolyzer {
|
|||||||
}
|
}
|
||||||
hologram1 {
|
hologram1 {
|
||||||
input: [["oc:circuitChip2", paneGlass, "oc:circuitChip2"]
|
input: [["oc:circuitChip2", paneGlass, "oc:circuitChip2"]
|
||||||
["oc:materialCircuitBoardPrinted", nuggetDiamond, "oc:materialCircuitBoardPrinted"]
|
["oc:materialCircuitBoardPrinted", chipDiamond, "oc:materialCircuitBoardPrinted"]
|
||||||
[obsidian, yellowDust, obsidian]]
|
[obsidian, yellowDust, obsidian]]
|
||||||
}
|
}
|
||||||
hologram2 {
|
hologram2 {
|
||||||
|
@ -187,11 +187,6 @@ tradingUpgrade {
|
|||||||
[dropper, "oc:materialCircuitBoardPrinted", craftingPiston]]
|
[dropper, "oc:materialCircuitBoardPrinted", craftingPiston]]
|
||||||
}
|
}
|
||||||
|
|
||||||
nuggetIron {
|
|
||||||
type: shapeless
|
|
||||||
input: ingotIron
|
|
||||||
output: 9
|
|
||||||
}
|
|
||||||
cuttingWire {
|
cuttingWire {
|
||||||
input: [[stickWood, nuggetIron, stickWood]]
|
input: [[stickWood, nuggetIron, stickWood]]
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
After Width: | Height: | Size: 215 B |
Binary file not shown.
Before Width: | Height: | Size: 209 B |
@ -87,7 +87,7 @@ object Constants {
|
|||||||
final val DataCardTier3 = "dataCard3"
|
final val DataCardTier3 = "dataCard3"
|
||||||
final val DebugCard = "debugCard"
|
final val DebugCard = "debugCard"
|
||||||
final val Debugger = "debugger"
|
final val Debugger = "debugger"
|
||||||
final val DiamondNugget = "nuggetDiamond"
|
final val DiamondChip = "chipDiamond"
|
||||||
final val Disk = "disk"
|
final val Disk = "disk"
|
||||||
final val DiskDriveMountable = "diskDriveMountable"
|
final val DiskDriveMountable = "diskDriveMountable"
|
||||||
final val Drone = "drone"
|
final val Drone = "drone"
|
||||||
|
@ -47,7 +47,7 @@ class Proxy {
|
|||||||
OreDictionary.registerOre("chest", net.minecraft.init.Blocks.trapped_chest)
|
OreDictionary.registerOre("chest", net.minecraft.init.Blocks.trapped_chest)
|
||||||
|
|
||||||
tryRegisterNugget[item.IronNugget](Constants.ItemName.IronNugget, "nuggetIron", net.minecraft.init.Items.iron_ingot, "ingotIron")
|
tryRegisterNugget[item.IronNugget](Constants.ItemName.IronNugget, "nuggetIron", net.minecraft.init.Items.iron_ingot, "ingotIron")
|
||||||
tryRegisterNugget[item.DiamondNugget](Constants.ItemName.DiamondNugget, "nuggetDiamond", net.minecraft.init.Items.diamond, "gemDiamond")
|
tryRegisterNugget[item.DiamondChip](Constants.ItemName.DiamondChip, "chipDiamond", net.minecraft.init.Items.diamond, "gemDiamond")
|
||||||
|
|
||||||
// Avoid issues with Extra Utilities registering colored obsidian as `obsidian`
|
// Avoid issues with Extra Utilities registering colored obsidian as `obsidian`
|
||||||
// oredict entry, but not normal obsidian, breaking some recipes.
|
// oredict entry, but not normal obsidian, breaking some recipes.
|
||||||
|
@ -533,7 +533,7 @@ object Items extends ItemAPI {
|
|||||||
Recipes.addSubItem(new item.TerminalServer(multi), Constants.ItemName.TerminalServer, "oc:terminalServer")
|
Recipes.addSubItem(new item.TerminalServer(multi), Constants.ItemName.TerminalServer, "oc:terminalServer")
|
||||||
Recipes.addSubItem(new item.DiskDriveMountable(multi), Constants.ItemName.DiskDriveMountable, "oc:diskDriveMountable")
|
Recipes.addSubItem(new item.DiskDriveMountable(multi), Constants.ItemName.DiskDriveMountable, "oc:diskDriveMountable")
|
||||||
Recipes.addSubItem(new item.UpgradeTrading(multi), Constants.ItemName.TradingUpgrade, "oc:tradingUpgrade")
|
Recipes.addSubItem(new item.UpgradeTrading(multi), Constants.ItemName.TradingUpgrade, "oc:tradingUpgrade")
|
||||||
registerItem(new item.DiamondNugget(multi), Constants.ItemName.DiamondNugget)
|
registerItem(new item.DiamondChip(multi), Constants.ItemName.DiamondChip)
|
||||||
|
|
||||||
// Register aliases.
|
// Register aliases.
|
||||||
for ((k, v) <- aliases) {
|
for ((k, v) <- aliases) {
|
||||||
|
3
src/main/scala/li/cil/oc/common/item/DiamondChip.scala
Normal file
3
src/main/scala/li/cil/oc/common/item/DiamondChip.scala
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
package li.cil.oc.common.item
|
||||||
|
|
||||||
|
class DiamondChip(val parent: Delegator) extends traits.Delegate
|
@ -1,3 +0,0 @@
|
|||||||
package li.cil.oc.common.item
|
|
||||||
|
|
||||||
class DiamondNugget(val parent: Delegator) extends traits.Delegate
|
|
@ -351,7 +351,9 @@ object ModOpenComputers extends ModProxy {
|
|||||||
object DefinitionPathProvider extends PathProvider {
|
object DefinitionPathProvider extends PathProvider {
|
||||||
private final val Blacklist = Set(
|
private final val Blacklist = Set(
|
||||||
Constants.ItemName.Debugger,
|
Constants.ItemName.Debugger,
|
||||||
Constants.BlockName.Endstone
|
Constants.ItemName.DiamondChip,
|
||||||
|
Constants.BlockName.Endstone,
|
||||||
|
Constants.ItemName.IronNugget
|
||||||
)
|
)
|
||||||
|
|
||||||
override def pathFor(stack: ItemStack): String = Option(api.Items.get(stack)) match {
|
override def pathFor(stack: ItemStack): String = Option(api.Items.get(stack)) match {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user