X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameProc.java;h=08f44251f6ed20bdca7fa9d38cbcab54c799a647;hp=f3ea4ac131f79be3bfacd01cdac8449f7bfde00c;hb=be2690f1dee10f68a5ce6d576ace13c825ac5d15;hpb=19eb912d7ac7d2ef99f85ea4dd87c6611586891f

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
index f3ea4ac..08f4425 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameProc.java
@@ -2,112 +2,435 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
-import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.*;
+import ru.deadsoftware.cavecraft.CaveGame;
+import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavecraft.game.mobs.FallingGravel;
+import ru.deadsoftware.cavecraft.game.mobs.FallingSand;
 import ru.deadsoftware.cavecraft.game.mobs.Mob;
 import ru.deadsoftware.cavecraft.game.mobs.Pig;
+import ru.deadsoftware.cavecraft.game.objects.Drop;
 import ru.deadsoftware.cavecraft.game.objects.Player;
+import ru.deadsoftware.cavecraft.misc.AppState;
+import ru.deadsoftware.cavecraft.misc.Assets;
 
-public class GameProc {
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class GameProc implements Serializable {
 
     public static double RUN_TIME = 0;
 
+    public static boolean DO_UPD = false;
+    public static int UPD_X = -1, UPD_Y = -1;
+
     public Player player;
 
-    public Array<Mob> mobs;
+    public ArrayList<Mob> mobs;
+    public ArrayList<Drop> drops;
 
-    public GameWorld world;
-    public GameRenderer renderer;
-    public GamePhysics physics;
+    public transient GameWorld world;
+    public transient GameRenderer renderer;
+    public transient GamePhysics physics;
 
-    public int cursorX, cursorY;
-    public int invSlot;
+    public int curX, curY;
+    public int slot;
     public int ctrlMode;
+    public int creativeScroll, maxCreativeScroll;
+    public int blockDmg = 0;
 
-    public boolean isTouchDown, isKeyDown;
+    public boolean isTouchDown, isKeyDown, swim;
     public int touchDownX, touchDownY, keyDownCode;
-    public int touchDownButton;
+    public int touchDownBtn;
     public long touchDownTime;
 
     public GameProc() {
-        world = new GameWorld(1024,256);
-        renderer = new GameRenderer(this);
-        physics = new GamePhysics(this);
+        world = new GameWorld();
+        world.generate(1024, 256);
         player = new Player(world.getSpawnPoint());
-        mobs = new Array<Mob>();
-        for (int i=0; i<world.getWidth(); i+=64) {
-            mobs.add(new Pig(i*16, 0, world));
+        drops = new ArrayList<Drop>();
+        mobs = new ArrayList<Mob>();
+        for (int i = 0; i < 16; i++) {
+            mobs.add(new Pig(i * 256, 196 * 16));
+        }
+        physics = new GamePhysics(this);
+        if (CaveGame.TOUCH) {
+            renderer = new GameRenderer(this, 320,
+                    320 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
+        } else {
+            ctrlMode = 1;
+            renderer = new GameRenderer(this, 480,
+                    480 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
         }
-        if (!CaveGame.TOUCH) ctrlMode = 1;
+        maxCreativeScroll = GameItems.getItemsSize() / 8;
+        GameSaver.save(this);
     }
 
     public void resetRenderer() {
-        renderer = new GameRenderer(this);
+        if (CaveGame.TOUCH) {
+            renderer = new GameRenderer(this, 320,
+                    320 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
+        } else {
+            renderer = new GameRenderer(this, 480,
+                    480 * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
+        }
     }
 
     private boolean isAutoselectable(int x, int y) {
-        return (world.getForeMap(x,y)>0 &&
-                Items.BLOCKS.getValueAt(world.getForeMap(x,y)).collision);
+        return (world.getForeMap(x, y) > 0 &&
+                GameItems.getBlock(world.getForeMap(x, y)).coll);
     }
 
     private void moveCursor() {
+        int pastX = curX, pastY = curY;
         if (ctrlMode == 0 && CaveGame.TOUCH) {
-            cursorX = (int) (player.position.x + player.texWidth / 2) / 16;
-            if (player.dir == 0) cursorX--;
-                else cursorX++;
-            cursorY = (int) (player.position.y + player.texWidth) / 16;
-            if (!isAutoselectable(cursorX, cursorY)) {
-                cursorY++;
-            }
-            if (!isAutoselectable(cursorX, cursorY)) {
-                cursorY++;
-            }
-            if (!isAutoselectable(cursorX, cursorY)) {
-                if (player.dir == 0) cursorX++;
-                else cursorX--;
-            }
-            if (player.position.x<0) cursorX--;
-        } else if (!CaveGame.TOUCH){
-            cursorX = (int)(Gdx.input.getX()*
-                    (renderer.camera.viewportWidth/GameScreen.getWidth())+renderer.camera.position.x)/16;
-            cursorY = (int)(Gdx.input.getY()*
-                    (renderer.camera.viewportHeight/GameScreen.getHeight())+renderer.camera.position.y)/16;
-            if ((Gdx.input.getX()*
-                    (renderer.camera.viewportWidth/GameScreen.getWidth())+renderer.camera.position.x)<0)
-                cursorX--;
+            curX = (int) (player.pos.x + player.texWidth / 2) / 16;
+            if (player.dir == 0) curX--;
+            else curX++;
+            curY = (int) (player.pos.y + player.texWidth) / 16;
+            if (!isAutoselectable(curX, curY)) {
+                curY++;
+            }
+            if (!isAutoselectable(curX, curY)) {
+                curY++;
+            }
+            if (!isAutoselectable(curX, curY)) {
+                if (player.dir == 0) curX++;
+                else curX--;
+            }
+        } else if (!CaveGame.TOUCH) {
+            curX = (int) (Gdx.input.getX() *
+                    (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) / 16;
+            curY = (int) (Gdx.input.getY() *
+                    (renderer.getHeight() / GameScreen.getHeight()) + renderer.getCamY()) / 16;
+            if ((Gdx.input.getX() *
+                    (renderer.getWidth() / GameScreen.getWidth()) + renderer.getCamX()) < 0)
+                curX--;
         }
+        if (pastX != curX || pastY != curY) blockDmg = 0;
     }
 
     private void checkCursorBounds() {
-        if (cursorY < 0) cursorY = 0;
-        if (cursorY >= world.getHeight()) cursorY = world.getHeight()-1;
-        if (ctrlMode==1) {
-            if (cursorX*16+8<player.position.x+player.texWidth/2)
-                player.dir=0;
-            if (cursorX*16+8>player.position.x+player.texWidth/2)
-                player.dir=1;
+        if (curY < 0) curY = 0;
+        if (curY >= world.getHeight()) curY = world.getHeight() - 1;
+        if (ctrlMode == 1) {
+            if (curX * 16 + 8 < player.pos.x + player.texWidth / 2)
+                player.dir = 0;
+            if (curX * 16 + 8 > player.pos.x + player.texWidth / 2)
+                player.dir = 1;
+        }
+    }
+
+    private void updateFluids(int x, int y) {
+        if (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x, y) != 8) {
+            if (world.getForeMap(x, y) == 60) {
+                if (!GameItems.isWater(world.getForeMap(x, y - 1)))
+                    world.setForeMap(x, y, world.getForeMap(x, y) + 1);
+            } else if ((!GameItems.isWater(world.getForeMap(x - 1, y)) ||
+                    (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x - 1, y) >= world.getForeMap(x, y))) &&
+                    (!GameItems.isWater(world.getForeMap(x + 1, y)) ||
+                            (GameItems.isWater(world.getForeMap(x, y)) && world.getForeMap(x + 1, y) >= world.getForeMap(x, y)))) {
+                world.setForeMap(x, y, world.getForeMap(x, y) + 1);
+            }
+            if (world.getForeMap(x, y) > 63) world.setForeMap(x, y, 0);
+        }
+
+        if (world.getForeMap(x, y) == 8 || world.getForeMap(x, y) == 60) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 60);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isLava(world.getForeMap(x, y + 1))) {
+                if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4);
+                else world.setForeMap(x, y + 1, 68);
+            } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                if (world.getForeMap(x + 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x + 1, y)).coll && !GameItems.isFluid(world.getForeMap(x + 1, y))) ||
+                        (GameItems.isWater(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 61)) {
+                    world.setForeMap(x + 1, y, 61);
+                    updateBlock(x + 1, y + 1);
+                } else if (GameItems.isLava(world.getForeMap(x + 1, y))) {
+                    if (world.getForeMap(x + 1, y) > 9) world.setForeMap(x + 1, y, 4);
+                    else world.setForeMap(x + 1, y, 68);
+                } else if (world.getForeMap(x + 1, y) == 61 && (world.getForeMap(x + 2, y) == 8 || world.getForeMap(x + 2, y) == 60))
+                    world.setForeMap(x + 1, y, 8);
+
+                if (world.getForeMap(x - 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x - 1, y)).coll && !GameItems.isFluid(world.getForeMap(x - 1, y))) ||
+                        (GameItems.isWater(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 61)) {
+                    world.setForeMap(x - 1, y, 61);
+                    updateBlock(x - 1, y + 1);
+                } else if (GameItems.isLava(world.getForeMap(x - 1, y))) {
+                    if (world.getForeMap(x - 1, y) > 9) world.setForeMap(x - 1, y, 4);
+                    else world.setForeMap(x - 1, y, 68);
+                } else if (world.getForeMap(x - 1, y) == 61 && (world.getForeMap(x - 2, y) == 8 || world.getForeMap(x - 2, y) == 60))
+                    world.setForeMap(x - 1, y, 8);
+            }
+            return;
+        }
+        if (world.getForeMap(x, y) == 61) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 60);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isLava(world.getForeMap(x, y + 1))) {
+                if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4);
+                else world.setForeMap(x, y + 1, 68);
+            } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                if (world.getForeMap(x + 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x + 1, y)).coll && !GameItems.isFluid(world.getForeMap(x + 1, y))) ||
+                        (GameItems.isWater(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 62)) {
+                    world.setForeMap(x + 1, y, 62);
+                    updateBlock(x + 1, y + 1);
+                } else if (GameItems.isLava(world.getForeMap(x + 1, y))) {
+                    if (world.getForeMap(x + 1, y) > 9) world.setForeMap(x + 1, y, 4);
+                    else world.setForeMap(x + 1, y, 68);
+                }
+
+                if (world.getForeMap(x - 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x - 1, y)).coll && !GameItems.isFluid(world.getForeMap(x - 1, y))) ||
+                        (GameItems.isWater(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 62)) {
+                    world.setForeMap(x - 1, y, 62);
+                    updateBlock(x - 1, y + 1);
+                } else if (GameItems.isLava(world.getForeMap(x - 1, y))) {
+                    if (world.getForeMap(x - 1, y) > 9) world.setForeMap(x - 1, y, 4);
+                    else world.setForeMap(x - 1, y, 68);
+                }
+            }
+            return;
+        }
+        if (world.getForeMap(x, y) == 62) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 60);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isLava(world.getForeMap(x, y + 1))) {
+                if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4);
+                else world.setForeMap(x, y + 1, 68);
+            } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                if (world.getForeMap(x + 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x + 1, y)).coll && !GameItems.isFluid(world.getForeMap(x + 1, y)))) {
+                    world.setForeMap(x + 1, y, 63);
+                    updateBlock(x + 1, y + 1);
+                } else if (GameItems.isLava(world.getForeMap(x + 1, y))) {
+                    if (world.getForeMap(x + 1, y) > 9) world.setForeMap(x + 1, y, 4);
+                    else world.setForeMap(x + 1, y, 68);
+                }
+
+                if (world.getForeMap(x - 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x - 1, y)).coll && !GameItems.isFluid(world.getForeMap(x - 1, y)))) {
+                    world.setForeMap(x - 1, y, 63);
+                    updateBlock(x - 1, y + 1);
+                } else if (GameItems.isLava(world.getForeMap(x - 1, y))) {
+                    if (world.getForeMap(x - 1, y) > 9) world.setForeMap(x - 1, y, 4);
+                    else world.setForeMap(x - 1, y, 68);
+                }
+            }
+            return;
+        }
+        if (world.getForeMap(x, y) == 63) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 61 && world.getForeMap(x, y + 1) <= 63) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 60);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isLava(world.getForeMap(x, y + 1))) {
+                if (world.getForeMap(x, y + 1) > 9) world.setForeMap(x, y + 1, 4);
+                else world.setForeMap(x, y + 1, 68);
+            }
+            return;
+        }
+
+        if (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x, y) != 9) {
+            if (world.getForeMap(x, y) == 64) {
+                if (!GameItems.isLava(world.getForeMap(x, y - 1)))
+                    world.setForeMap(x, y, world.getForeMap(x, y) + 1);
+            } else if ((!GameItems.isLava(world.getForeMap(x, y - 1))) &&
+                    (!GameItems.isLava(world.getForeMap(x - 1, y)) ||
+                            (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x - 1, y) >= world.getForeMap(x, y))) &&
+                    (!GameItems.isLava(world.getForeMap(x + 1, y)) ||
+                            (GameItems.isLava(world.getForeMap(x, y)) && world.getForeMap(x + 1, y) >= world.getForeMap(x, y)))) {
+                world.setForeMap(x, y, world.getForeMap(x, y) + 1);
+            }
+            if (world.getForeMap(x, y) > 67) world.setForeMap(x, y, 0);
+        }
+
+        if (world.getForeMap(x, y) == 9 || world.getForeMap(x, y) == 64) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 64);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isWater(world.getForeMap(x, y + 1))) {
+                world.setForeMap(x, y + 1, 1);
+            } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                if (world.getForeMap(x + 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x + 1, y)).coll && !GameItems.isFluid(world.getForeMap(x + 1, y))) ||
+                        (GameItems.isLava(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 65)) {
+                    world.setForeMap(x + 1, y, 65);
+                    updateBlock(x + 1, y + 1);
+                } else if (GameItems.isWater(world.getForeMap(x + 1, y))) {
+                    world.setForeMap(x + 1, y, 1);
+                }
+
+                if (world.getForeMap(x - 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x - 1, y)).coll && !GameItems.isFluid(world.getForeMap(x - 1, y))) ||
+                        (GameItems.isLava(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 65)) {
+                    world.setForeMap(x - 1, y, 65);
+                    updateBlock(x - 1, y + 1);
+                } else if (GameItems.isWater(world.getForeMap(x - 1, y))) {
+                    world.setForeMap(x - 1, y, 1);
+                }
+            }
+            return;
+        }
+        if (world.getForeMap(x, y) == 65) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 64);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isWater(world.getForeMap(x, y + 1))) {
+                world.setForeMap(x, y + 1, 1);
+            } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                if (world.getForeMap(x + 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x + 1, y)).coll && !GameItems.isFluid(world.getForeMap(x + 1, y))) ||
+                        (GameItems.isLava(world.getForeMap(x + 1, y)) && world.getForeMap(x + 1, y) > 66)) {
+                    world.setForeMap(x + 1, y, 66);
+                    updateBlock(x + 1, y + 1);
+                } else if (GameItems.isWater(world.getForeMap(x + 1, y))) {
+                    world.setForeMap(x + 1, y, 1);
+                }
+
+                if (world.getForeMap(x - 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x - 1, y)).coll && !GameItems.isFluid(world.getForeMap(x - 1, y))) ||
+                        (GameItems.isLava(world.getForeMap(x - 1, y)) && world.getForeMap(x - 1, y) > 66)) {
+                    world.setForeMap(x - 1, y, 66);
+                    updateBlock(x - 1, y + 1);
+                } else if (GameItems.isWater(world.getForeMap(x - 1, y))) {
+                    world.setForeMap(x - 1, y, 1);
+                }
+            }
+            return;
+        }
+        if (world.getForeMap(x, y) == 66) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 64);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isWater(world.getForeMap(x, y + 1))) {
+                world.setForeMap(x, y + 1, 1);
+            } else if (GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                if (world.getForeMap(x + 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x + 1, y)).coll && !GameItems.isFluid(world.getForeMap(x + 1, y)))) {
+                    world.setForeMap(x + 1, y, 67);
+                    updateBlock(x + 1, y + 1);
+                } else if (GameItems.isWater(world.getForeMap(x + 1, y))) {
+                    world.setForeMap(x + 1, y, 1);
+                }
+
+                if (world.getForeMap(x - 1, y) == 0 ||
+                        (!GameItems.getBlock(world.getForeMap(x - 1, y)).coll && !GameItems.isFluid(world.getForeMap(x - 1, y)))) {
+                    world.setForeMap(x - 1, y, 67);
+                    updateBlock(x - 1, y + 1);
+                } else if (GameItems.isWater(world.getForeMap(x - 1, y))) {
+                    world.setForeMap(x - 1, y, 1);
+                }
+            }
+            return;
+        }
+        if (world.getForeMap(x, y) == 67) {
+            if (world.getForeMap(x, y + 1) == 0 || (world.getForeMap(x, y + 1) >= 65 && world.getForeMap(x, y + 1) <= 67) ||
+                    (!GameItems.getBlock(world.getForeMap(x, y + 1)).coll && !GameItems.isFluid(world.getForeMap(x, y + 1)))) {
+                world.setForeMap(x, y + 1, 64);
+                updateBlock(x, y + 2);
+            } else if (GameItems.isWater(world.getForeMap(x, y + 1))) {
+                world.setForeMap(x, y + 1, 1);
+            }
+            return;
+        }
+    }
+
+    private void updateBlock(int x, int y) {
+        if (world.getForeMap(x, y) == 10) {
+            if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                world.setForeMap(x, y, 0);
+                mobs.add(new FallingSand(x * 16, y * 16));
+                updateBlock(x, y - 1);
+            }
+        }
+
+        if (world.getForeMap(x, y) == 11) {
+            if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                world.setForeMap(x, y, 0);
+                mobs.add(new FallingGravel(x * 16, y * 16));
+                updateBlock(x, y - 1);
+            }
+        }
+
+        if (world.getForeMap(x, y) == 59) {
+            if (world.getForeMap(x, y + 1) == 0 || !GameItems.getBlock(world.getForeMap(x, y + 1)).coll) {
+                world.setForeMap(x, y, 0);
+                updateBlock(x, y - 1);
+            }
+        }
+
+        if (world.getForeMap(x, y) == 2) {
+            if (world.getForeMap(x, y - 1) > 0 && (GameItems.getBlock(world.getForeMap(x, y - 1)).coll ||
+                    GameItems.isFluid(world.getForeMap(x, y - 1)))) {
+                world.setForeMap(x, y, 3);
+            }
+        }
+    }
+
+    public void useItem(int x, int y, int id, boolean bg) {
+        if (id > 0 && GameItems.getItem(id).getType() == 0) {
+            if (!bg) world.placeToForeground(x, y, GameItems.getItem(id).getBlock());
+            else world.placeToBackground(x, y, GameItems.getItem(id).getBlock());
         }
     }
 
     public void update(float delta) {
         RUN_TIME += delta;
 
+        if (DO_UPD) {
+            for (int y = UPD_Y; y < UPD_Y + 16; y++)
+                for (int x = UPD_X; x < UPD_X + 16; x++) {
+                    updateBlock(x, y);
+                }
+            DO_UPD = false;
+        }
+
+        for (int y = 0; y < world.getHeight(); y++) {
+            for (int x = (int) renderer.getCamX() / 16 - 1; x < (int) (renderer.getCamX() + renderer.getWidth()) / 16 + 1; x++) {
+                updateFluids(x, y);
+            }
+        }
+
         physics.update(delta);
         moveCursor();
         checkCursorBounds();
 
+        if (isTouchDown && touchDownBtn == Input.Buttons.LEFT) {
+            if (world.getForeMap(curX, curY) > 0 &&
+                    GameItems.getBlock(world.getForeMap(curX, curY)).getHp() >= 0) {// || world.getBackMap(curX, curY) > 0) {
+                blockDmg++;
+                if (blockDmg >= GameItems.getBlock(world.getForeMap(curX, curY)).getHp()) {
+                    if (GameItems.getBlock(world.getForeMap(curX, curY)).getDrop() > 0)
+                        drops.add(new Drop(curX * 16 + 4, curY * 16 + 4, GameItems.getBlock(world.getForeMap(curX, curY)).getDrop()));
+                    world.placeToForeground(curX, curY, 0);
+                    blockDmg = 0;
+                }
+            }
+        }
+
         if (isTouchDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) {
-            if (touchDownButton== Input.Buttons.RIGHT) {
-                world.placeToBackground(cursorX, cursorY,
-                        player.inventory[invSlot]);
-            } else if (touchDownButton==Input.Buttons.LEFT &&
-                    touchDownY< Assets.invBar.getRegionHeight() &&
-                    touchDownX>renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
-                    touchDownX<renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
-                CaveGame.STATE = GameState.GAME_CREATIVE_INV;
-            }
-            isTouchDown = false;
+            if (touchDownBtn == Input.Buttons.RIGHT) {
+                useItem(curX, curY, player.inv[slot], true);
+                isTouchDown = false;
+            } else if (touchDownY < Assets.invBar.getRegionHeight() &&
+                    touchDownX > renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 &&
+                    touchDownX < renderer.getWidth() / 2 + Assets.invBar.getRegionWidth() / 2) {
+                CaveGame.STATE = AppState.GAME_CREATIVE_INV;
+                isTouchDown = false;
+            }
         }
     }