Delete old GameItems

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

diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
index 70879e4f1499d2db2d91d19107a9852d45c31ede..4743fcfc54289382a255855e97210dc113c1bc34 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/FallingGravel.java
@@ -1,10 +1,14 @@
 package ru.deadsoftware.cavedroid.game.mobs;
 
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.Vector2;
-import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.GameItemsHolder;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
+import ru.deadsoftware.cavedroid.misc.Assets;
 
-import static ru.deadsoftware.cavedroid.GameScreen.GP;
+import javax.annotation.CheckForNull;
 
 /**
  * Falling gravel is actually a mob, that spawns in place of gravel when there is no block under it,
@@ -12,6 +16,8 @@ import static ru.deadsoftware.cavedroid.GameScreen.GP;
  */
 public class FallingGravel extends Mob {
 
+    private static final String TAG = "FallingGravel";
+
     /**
      * Creates a FallingGravel mob at coordinates
      *
@@ -19,14 +25,24 @@ public class FallingGravel extends Mob {
      * @param y Y in pixels
      */
     public FallingGravel(float x, float y) {
-        super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL);
-        move = new Vector2(0, 1);
+        super(x, y, 16, 16, Direction.LEFT, Type.GRAVEL, Integer.MAX_VALUE);
+        mVelocity = new Vector2(0, 1);
+    }
+
+    @Override
+    public float getSpeed() {
+        return 0;
     }
 
     @Override
-    public void ai() {
-        if (move.isZero()) {
-            GP.world.setForeMap(getMapX(), getMiddleMapY(), 11);
+    public void jump() {
+        // no-op
+    }
+
+    @Override
+    public void ai(GameWorld gameWorld, GameItemsHolder gameItemsHolder, float delta) {
+        if (mVelocity.isZero()) {
+            gameWorld.setForeMap(getMapX(), getMiddleMapY(), gameItemsHolder.getBlock("gravel"));
             kill();
         }
     }
@@ -36,8 +52,16 @@ public class FallingGravel extends Mob {
     }
 
     @Override
-    public void draw(SpriteBatch spriteBatch, float x, float y) {
-        spriteBatch.draw(GameItems.getBlockTex(11), x, y);
+    public void draw(SpriteBatch spriteBatch, float x, float y, float delta) {
+        @CheckForNull final Texture texture = Assets.blockTextures.get("gravel");
+
+        if (texture == null) {
+            Gdx.app.error(TAG, "Couldn't draw: texture not found");
+            kill();
+            return;
+        }
+
+        spriteBatch.draw(texture, x, y);
     }
 
 }