Store block references intead of ids

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / mobs / Player.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
index 34232f705e7e3fdf4303b6db6ecd16488de2c061..d6d848c12621aad20fd0c6c471814aaaf60b26c6 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Player.java
@@ -5,8 +5,9 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.math.Vector2;
 import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.GameItemsHolder;
+import ru.deadsoftware.cavedroid.game.model.item.Item;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
-import ru.deadsoftware.cavedroid.game.objects.Item;
 import ru.deadsoftware.cavedroid.game.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin;
@@ -36,8 +37,8 @@ public class Player extends Mob {
         swim = false;
     }
 
-    public void respawn(GameWorld gameWorld) {
-        Vector2 pos = getSpawnPoint(gameWorld);
+    public void respawn(GameWorld gameWorld, GameItemsHolder itemsHolder) {
+        Vector2 pos = getSpawnPoint(gameWorld, itemsHolder);
         this.x = pos.x;
         this.y = pos.y;
         mVelocity.setZero();
@@ -55,15 +56,15 @@ public class Player extends Mob {
         }
     }
 
-    private Vector2 getSpawnPoint(GameWorld gameWorld) {
+    private Vector2 getSpawnPoint(GameWorld gameWorld, GameItemsHolder itemsHolder) {
         int y;
         for (y = 0; y < gameWorld.getHeight(); y++) {
             if (y == gameWorld.getHeight() - 1) {
                 y = 60;
-                gameWorld.setForeMap(0, y, 1);
+                gameWorld.setForeMap(0, y, itemsHolder.getBlock("grass"));
                 break;
             }
-            if (gameWorld.hasForeAt(0, y) && gameWorld.getForeMapBlock(0, y).hasCollision()) {
+            if (gameWorld.hasForeAt(0, y) && gameWorld.getForeMap(0, y).hasCollision()) {
                 break;
             }
         }
@@ -76,6 +77,10 @@ public class Player extends Mob {
         }
     }
 
+    public void setCurrentInventorySlotItem(int itemId) {
+        inventory[slot] = itemId;
+    }
+
     @Override
     public float getSpeed() {
         return SPEED;
@@ -87,7 +92,7 @@ public class Player extends Mob {
     }
 
     @Override
-    public void ai(GameWorld gameWorld, float delta) {
+    public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
     }
 
     @Override
@@ -112,23 +117,21 @@ public class Player extends Mob {
 
     private void drawItem(SpriteBatch spriteBatch, float x, float y, float anim) {
         final int itemId = inventory[slot];
-        final Item item = GameItems.getItem(itemId);
 
-        @CheckForNull final Sprite sprite = item.isBlock()
-                ? item.toBlock().getTexture()
-                : item.getSprite();
-
-        if (sprite == null) {
+        if (itemId == 0) {
             return;
         }
 
+        final Item item = GameItems.getItem(itemId);
+        final Sprite sprite = item.getSprite();
+
         if (!item.isTool()) {
             sprite.setSize(Drop.DROP_SIZE, Drop.DROP_SIZE);
         }
 
         final float handLength = Assets.playerSprite[0][2].getHeight();
 
-        final SpriteOrigin spriteOrigin = item.getDefaultOrigin();
+        final SpriteOrigin spriteOrigin = item.getParams().getInHandSpriteOrigin();
         final int handMultiplier = -getDirection().getBasis();
         final float xOffset = (-1 + getDirection().getIndex()) * sprite.getWidth() + 4 + handMultiplier * (sprite.getWidth() * spriteOrigin.getX());
         final float yOffset = item.isTool() ? -sprite.getHeight() / 2 : 0;
@@ -173,6 +176,7 @@ public class Player extends Mob {
 
         if (hitAnim < 30f || hitAnim > 90f) {
             if (hitting) {
+                hitAnim = MathUtils.clamp(hitAnim, 30f, 90f);
                 hitAnimDelta = -hitAnimDelta;
             } else  {
                 hitAnimDelta = ANIMATION_SPEED;