From 6b0eeb66b95ddacdfa5d90d7d38b04fb987033e2 Mon Sep 17 00:00:00 2001 From: Nico Date: Sat, 5 Apr 2014 21:00:21 +0200 Subject: [PATCH] renamed blockplacerairupgrade to angelUpgrade --- .../resources/assets/opencomputers/recipes/default.recipes | 2 +- src/main/scala/li/cil/oc/Items.scala | 4 ++-- src/main/scala/li/cil/oc/common/Proxy.scala | 2 +- .../{UpgradeBlockPlacerAir.scala => UpgradeAngel.scala} | 6 +++--- .../{UpgradeBlockPlacerAir.scala => UpgradeAngel.scala} | 4 ++-- src/main/scala/li/cil/oc/server/component/robot/Robot.scala | 2 +- .../{UpgradeBlockPlacerAir.scala => UpgradeAngel.scala} | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) rename src/main/scala/li/cil/oc/common/item/{UpgradeBlockPlacerAir.scala => UpgradeAngel.scala} (82%) rename src/main/scala/li/cil/oc/server/component/{UpgradeBlockPlacerAir.scala => UpgradeAngel.scala} (75%) rename src/main/scala/li/cil/oc/server/driver/item/{UpgradeBlockPlacerAir.scala => UpgradeAngel.scala} (77%) diff --git a/src/main/resources/assets/opencomputers/recipes/default.recipes b/src/main/resources/assets/opencomputers/recipes/default.recipes index 7a46f6e24..bbcdc87ec 100644 --- a/src/main/resources/assets/opencomputers/recipes/default.recipes +++ b/src/main/resources/assets/opencomputers/recipes/default.recipes @@ -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]] diff --git a/src/main/scala/li/cil/oc/Items.scala b/src/main/scala/li/cil/oc/Items.scala index 4303c5139..513318e44 100644 --- a/src/main/scala/li/cil/oc/Items.scala +++ b/src/main/scala/li/cil/oc/Items.scala @@ -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() diff --git a/src/main/scala/li/cil/oc/common/Proxy.scala b/src/main/scala/li/cil/oc/common/Proxy.scala index 8a88e1949..892da9d42 100644 --- a/src/main/scala/li/cil/oc/common/Proxy.scala +++ b/src/main/scala/li/cil/oc/common/Proxy.scala @@ -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) { diff --git a/src/main/scala/li/cil/oc/common/item/UpgradeBlockPlacerAir.scala b/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala similarity index 82% rename from src/main/scala/li/cil/oc/common/item/UpgradeBlockPlacerAir.scala rename to src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala index 928b2290b..0bb67a152 100644 --- a/src/main/scala/li/cil/oc/common/item/UpgradeBlockPlacerAir.scala +++ b/src/main/scala/li/cil/oc/common/item/UpgradeAngel.scala @@ -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") } } diff --git a/src/main/scala/li/cil/oc/server/component/UpgradeBlockPlacerAir.scala b/src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala similarity index 75% rename from src/main/scala/li/cil/oc/server/component/UpgradeBlockPlacerAir.scala rename to src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala index b52567240..1c0785d07 100644 --- a/src/main/scala/li/cil/oc/server/component/UpgradeBlockPlacerAir.scala +++ b/src/main/scala/li/cil/oc/server/component/UpgradeAngel.scala @@ -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() // ----------------------------------------------------------------------- // diff --git a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala index 19a1143ba..fd8e08cfc 100644 --- a/src/main/scala/li/cil/oc/server/component/robot/Robot.scala +++ b/src/main/scala/li/cil/oc/server/component/robot/Robot.scala @@ -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 diff --git a/src/main/scala/li/cil/oc/server/driver/item/UpgradeBlockPlacerAir.scala b/src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala similarity index 77% rename from src/main/scala/li/cil/oc/server/driver/item/UpgradeBlockPlacerAir.scala rename to src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala index 6b92c132b..5b24da5bb 100644 --- a/src/main/scala/li/cil/oc/server/driver/item/UpgradeBlockPlacerAir.scala +++ b/src/main/scala/li/cil/oc/server/driver/item/UpgradeAngel.scala @@ -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 }