Fix looking TODOs in interact plugin, add eye_pos property to clientinfo

Author: Gjum

spockbot/mcdata/constants.py

@@ -8,6 +8,7 @@
 ###########
 
 CLIENT_TICK_RATE = 0.05
+PLAYER_EYE_HEIGHT = 1.62
 PLAYER_HEIGHT = 1.80
 PLAYER_WIDTH = 0.6
 

spockbot/plugins/helpers/clientinfo.py

@@ -78,8 +78,9 @@ class ClientInfo(object):
         game_info (GameInfo): Information about the current world/server
         spawn_position (Position): Players initial position
         health (PlayerHealth): Player's health, food and saturation
-        position (PlayerPosition): Player's Current position
+        position (PlayerPosition): Player's current position
         player_list (dict): List of all players in the server
+        eye_pos (PlayerPosition): Player's eye position
 
     """
     def __init__(self):
@@ -94,6 +95,10 @@ def __init__(self):
         self.position = PlayerPosition()
         self.player_list = {}
 
+    @property
+    def eye_pos(self):
+        return self.position + (0, const.PLAYER_EYE_HEIGHT, 0)
+
     def reset(self):
         """Resets the information in ClientInfo"""
         self.__init__()

spockbot/plugins/helpers/interact.py

@@ -84,11 +84,10 @@ def look_at_rel(self, delta):
         self.look(*delta.yaw_pitch)
 
     def look_at(self, pos):
-        delta = pos - self.clientinfo.position
-        delta.y -= constants.PLAYER_HEIGHT
+        delta = pos - self.clientinfo.eye_pos
         if delta.x or delta.z:
             self.look_at_rel(delta)
-        else:
+        else:  # looking up or down, do not turn head
             self.look(self.clientinfo.position.yaw, delta.yaw_pitch.pitch)
 
     def _send_dig_block(self, status, pos=None, face=constants.FACE_Y_POS):
@@ -102,7 +101,7 @@ def _send_dig_block(self, status, pos=None, face=constants.FACE_Y_POS):
 
     def start_digging(self, pos):
         if self.auto_look:
-            self.look_at(pos)  # TODO look at block center
+            self.look_at(pos.floor().iadd(0.5, 0.5, 0.5))
         self._send_dig_block(constants.DIG_START, pos)
         if self.auto_swing:
             self.swing_arm()
@@ -144,7 +143,7 @@ def click_block(self, pos, face=1, cursor_pos=Vector3(8, 8, 8),
         """
         if look_at_block and self.auto_look:
             # TODO look at cursor_pos
-            self.look_at(pos)
+            self.look_at(pos.floor().iadd(0.5, 0.5, 0.5))
         self._send_click_block(pos, face, cursor_pos)
         if swing and self.auto_swing:
             self.swing_arm()

tests/plugins/helpers/test_interact.py

@@ -1,7 +1,6 @@
 from unittest import TestCase
 
-from spockbot.mcdata.constants import \
-    ATTACK_ENTITY, INTERACT_ENTITY, PLAYER_HEIGHT
+from spockbot.mcdata import constants
 from spockbot.plugins.helpers.clientinfo import PlayerPosition
 from spockbot.plugins.helpers.interact import InteractPlugin
 from spockbot.vector import Vector3
@@ -53,6 +52,7 @@ class InventoryMock(object):
 class ClientInfoMock(object):
     eid = 123
     position = PlayerPosition(1., 2., 3.)
+    eye_pos = position + (0, constants.PLAYER_EYE_HEIGHT, 0)
 
 
 class InteractPluginTest(TestCase):
@@ -97,7 +97,7 @@ def test_look(self):
         self.assertAlmostEqual(ClientInfoMock.position.yaw, -90)
         self.assertAlmostEqual(ClientInfoMock.position.pitch, 0)
 
-        self.plug.look_at(Vector3(0, 2 + PLAYER_HEIGHT, 3))
+        self.plug.look_at(Vector3(0, 2 + constants.PLAYER_EYE_HEIGHT, 3))
         self.assertAlmostEqual(ClientInfoMock.position.yaw, 90)
         self.assertAlmostEqual(ClientInfoMock.position.pitch, 0)
 
@@ -115,32 +115,32 @@ def test_activate_item(self):
         # TODO deactivate_item
 
     def test_entity(self):
-        entity = DataDict(eid=234, x=2, y=2 + PLAYER_HEIGHT, z=4)
+        entity = DataDict(eid=234, x=2, y=2 + constants.PLAYER_EYE_HEIGHT, z=4)
 
         self.plug.use_entity(entity)
         self.assertAlmostEqual(ClientInfoMock.position.yaw, -45)
         self.assertAlmostEqual(ClientInfoMock.position.pitch, 0)
-        self.assertEqual(NetMock.datas[-2].action, INTERACT_ENTITY)
+        self.assertEqual(NetMock.datas[-2].action, constants.INTERACT_ENTITY)
         self.assertEqual(NetMock.datas[-2].target, 234)
         self.assertEqual(NetMock.idents[-1], 'PLAY>Animation')
 
         self.plug.auto_look = False
-        entity = DataDict(eid=345, x=0, y=3 + PLAYER_HEIGHT, z=3)
+        entity = DataDict(eid=345, x=0, y=3 + constants.PLAYER_EYE_HEIGHT, z=3)
         self.plug.attack_entity(entity)
         # different pos, but look shouldn't have changed
         self.assertAlmostEqual(ClientInfoMock.position.yaw, -45)
         self.assertAlmostEqual(ClientInfoMock.position.pitch, 0)
-        self.assertEqual(NetMock.datas[-2].action, ATTACK_ENTITY)
+        self.assertEqual(NetMock.datas[-2].action, constants.ATTACK_ENTITY)
         self.assertEqual(NetMock.datas[-2].target, 345)
         self.assertEqual(NetMock.idents[-1], 'PLAY>Animation')
         self.plug.auto_look = True
 
         self.plug.auto_swing = False
-        entity = DataDict(eid=456, x=2, y=3 + PLAYER_HEIGHT, z=3)
+        entity = DataDict(eid=456, x=2, y=3 + constants.PLAYER_EYE_HEIGHT, z=3)
         self.plug.mount_vehicle(entity)
         self.assertAlmostEqual(ClientInfoMock.position.yaw, -90)
         self.assertAlmostEqual(ClientInfoMock.position.pitch, -45)
-        self.assertEqual(NetMock.datas[-1].action, INTERACT_ENTITY)
+        self.assertEqual(NetMock.datas[-1].action, constants.INTERACT_ENTITY)
         self.assertEqual(NetMock.datas[-1].target, 456)
         self.plug.auto_swing = True