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

Localizing drone name for tooltips / Waila and making item swing when using analyzer on entities.

Browse Source
This commit is contained in:
Florian Nücke 2015-01-01 23:36:30 +01:00
parent 44194b6422
commit 2949a13cbe
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/assets/opencomputers/lang/en_US.lang
View File

@ -124,6 +124,9 @@ item.oc.UpgradeTankController.name=Tank Controller Upgrade
item.oc.UpgradeTractorBeam.name=Tractor Beam Upgrade item.oc.UpgradeTractorBeam.name=Tractor Beam Upgrade
item.oc.WirelessNetworkCard.name=Wireless Network Card item.oc.WirelessNetworkCard.name=Wireless Network Card
# Entities
entity.oc.Drone.name=Drone
# GUI # GUI
oc:gui.Analyzer.Address=§6Address§f: %s oc:gui.Analyzer.Address=§6Address§f: %s
oc:gui.Analyzer.AddressCopied=Address copied to clipboard. oc:gui.Analyzer.AddressCopied=Address copied to clipboard.

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

@ -434,6 +434,8 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
// ----------------------------------------------------------------------- // // ----------------------------------------------------------------------- //
override def getCommandSenderName = Localization.localizeImmediately("entity.oc.Drone.name")
override def handleWaterMovement() = { override def handleWaterMovement() = {
inWater = worldObj.handleMaterialAcceleration(boundingBox, Material.water, this) inWater = worldObj.handleMaterialAcceleration(boundingBox, Material.water, this)
inWater inWater

4
src/main/scala/li/cil/oc/common/item/Analyzer.scala
View File

@ -22,8 +22,10 @@ object Analyzer {
val player = e.entityPlayer val player = e.entityPlayer
val held = player.getHeldItem val held = player.getHeldItem
if (api.Items.get(held) == analyzer) { if (api.Items.get(held) == analyzer) {
if (analyze(e.target, player, 0, 0, 0, 0)) if (analyze(e.target, player, 0, 0, 0, 0)) {
player.swingItem()
e.setCanceled(true) e.setCanceled(true)
}
} }
} }