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

renamed blockplacerairupgrade to angelUpgrade

Browse Source
This commit is contained in:
Nico 2014-04-05 21:00:21 +02:00
parent 0816f322ac
commit 6b0eeb66b9
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/assets/opencomputers/recipes/default.recipes
View File

@ -118,7 +118,7 @@ navigationUpgrade {
["oc:circuitTier3", {item=map, subID=any}, "oc:circuitTier3"]
[ingotGold, potion, ingotGold]]
}
blockPlacerAirUpgrade {
blockAngel {
input: [[ingotIron, enderPearl, ingotIron]
["oc:circuitTier1", pistonStickyBase, "oc:circuitTier1"]
[ingotIron, enderPearl, ingotIron]]

4
src/main/scala/li/cil/oc/Items.scala
View File

@ -45,7 +45,7 @@ object Items {
var upgradeNavigation: item.UpgradeNavigation = _
var upgradeSign: item.UpgradeSign = _
var upgradeSolarGenerator: item.UpgradeSolarGenerator = _
var upgradeBlockPlacerAir: item.UpgradeBlockPlacerAir = _
var upgradeAngel: item.UpgradeAngel = _
// ----------------------------------------------------------------------- //
// Crafting
@ -149,7 +149,7 @@ object Items {
// v1.2.6
interweb = Recipes.addItemDelegate(new item.Interweb(multi), "interweb")
upgradeBlockPlacerAir = Recipes.addItemDelegate(new item.UpgradeBlockPlacerAir(multi), "blockPlacerAirUpgrade")
upgradeAngel = Recipes.addItemDelegate(new item.UpgradeAngel(multi), "AngelUpgrade")
// Initialize API.
api.Items.AbstractBusCard = abstractBus.createItemStack()

2
src/main/scala/li/cil/oc/common/Proxy.scala
View File

@ -63,7 +63,7 @@ class Proxy {
api.Driver.add(driver.item.UpgradeNavigation)
api.Driver.add(driver.item.UpgradeSign)
api.Driver.add(driver.item.UpgradeSolarGenerator)
api.Driver.add(driver.item.UpgradeBlockPlacerAir)
api.Driver.add(driver.item.UpgradeAngel)
api.Driver.add(driver.item.WirelessNetworkCard)
if (Mods.ComputerCraft15.isAvailable) {

6
src/main/scala/li/cil/oc/common/item/UpgradeBlockPlacerAir.scala → src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala
View File

@ -7,8 +7,8 @@ import li.cil.oc.Settings
import li.cil.oc.util.Tooltip
import net.minecraft.client.renderer.texture.IconRegister
class UpgradeBlockPlacerAir(val parent: Delegator) extends Delegate {
val unlocalizedName = "UpgradeBlockPlacerAir"
class UpgradeAngel(val parent: Delegator) extends Delegate {
val unlocalizedName = "UpgradeAngel"
override def rarity = EnumRarity.epic
@ -20,6 +20,6 @@ class UpgradeBlockPlacerAir(val parent: Delegator) extends Delegate {
override def registerIcons(iconRegister: IconRegister) = {
super.registerIcons(iconRegister)
icon = iconRegister.registerIcon(Settings.resourceDomain + ":upgrade_block_placer_air")
icon = iconRegister.registerIcon(Settings.resourceDomain + ":upgrade_angel")
}
}

4
src/main/scala/li/cil/oc/server/component/UpgradeBlockPlacerAir.scala → src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala
View File

@ -5,9 +5,9 @@ import net.minecraft.tileentity.TileEntity
import li.cil.oc.api.Network
import li.cil.oc.api.network.Visibility
class UpgradeBlockPlacerAir(val owner: TileEntity) extends ManagedComponent {
class UpgradeAngel(val owner: TileEntity) extends ManagedComponent {
val node = Network.newNode(this, Visibility.Network).
withComponent("airplacer").
withComponent("angel").
create()
// ----------------------------------------------------------------------- //

2
src/main/scala/li/cil/oc/server/component/robot/Robot.scala
View File

@ -244,7 +244,7 @@ class Robot(val robot: tileentity.Robot) extends ManagedComponent {
case Some(hit) if hit.typeOfHit == EnumMovingObjectType.TILE =>
val (bx, by, bz, hx, hy, hz) = clickParamsFromHit(hit)
player.placeBlock(robot.selectedSlot, bx, by, bz, hit.sideHit, hx, hy, hz)
case None if (Items.multi.subItem(robot.getStackInSlot(3)).orNull == Items.upgradeBlockPlacerAir) && player.closestEntity[Entity]().isEmpty =>
case None if (Items.multi.subItem(robot.getStackInSlot(3)).orNull == Items.upgradeAngel) && player.closestEntity[Entity]().isEmpty =>
val (bx, by, bz, hx, hy, hz) = clickParamsFromFacing(facing, side)
player.placeBlock(robot.selectedSlot, bx, by, bz, side.getOpposite.ordinal, hx, hy, hz)
case _ => false

6
src/main/scala/li/cil/oc/server/driver/item/UpgradeBlockPlacerAir.scala → src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala
View File

@ -7,12 +7,12 @@ import li.cil.oc.server.component
import net.minecraft.item.ItemStack
import net.minecraft.tileentity.TileEntity
object UpgradeBlockPlacerAir extends Item {
override def worksWith(stack: ItemStack) = isOneOf(stack, Items.upgradeBlockPlacerAir)
object UpgradeAngel extends Item {
override def worksWith(stack: ItemStack) = isOneOf(stack, Items.upgradeAngel)
override def createEnvironment(stack: ItemStack, container: TileEntity) =
container match {
case robot: Robot => new component.UpgradeBlockPlacerAir(robot)
case robot: Robot => new component.UpgradeAngel(robot)
case _ => null
}