X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameInput.java;h=e1257d518fce877884bde4e669a5b089918e2037;hb=3512986410bc04017c9c15d3bebac5fe5cdd0e84;hp=379f9301b782a07aa4eba9398093c3394338a2f8;hpb=17c1be4c02b27fefa1bf6abd0547ac7e9743d493;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index 379f930..e1257d5 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
@@ -3,70 +3,121 @@ package ru.deadsoftware.cavedroid.game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.utils.TimeUtils;
 import com.google.common.collect.Range;
-import ru.deadsoftware.cavedroid.CaveGame;
-import ru.deadsoftware.cavedroid.GameScreen;
+import ru.deadsoftware.cavedroid.MainConfig;
+import ru.deadsoftware.cavedroid.game.actions.CommonBlockActionUtilsKt;
+import ru.deadsoftware.cavedroid.game.actions.placeblock.IPlaceBlockAction;
+import ru.deadsoftware.cavedroid.game.actions.useitem.IUseItemAction;
 import ru.deadsoftware.cavedroid.game.mobs.Mob;
+import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.mobs.Pig;
+import ru.deadsoftware.cavedroid.game.mobs.Player;
+import ru.deadsoftware.cavedroid.game.model.item.Item;
+import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
 import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.ControlMode;
-import ru.deadsoftware.cavedroid.misc.states.AppState;
-import ru.deadsoftware.cavedroid.misc.states.GameState;
 
-import static ru.deadsoftware.cavedroid.GameScreen.GP;
-import static ru.deadsoftware.cavedroid.game.GameItems.*;
+import javax.annotation.CheckForNull;
+import javax.inject.Inject;
 
-public class GameInput {
-
-    private boolean keyDown, touchedDown;
+import java.util.Map;
 
-    private int keyDownCode, touchDownBtn;
-    private float touchDownX, touchDownY;
-    private long touchDownTime;
+@GameScope
+public class GameInput {
 
-    private int curX, curY;
-    private int creativeScroll;
-    private int blockDamage;
+    private static final String TAG = "GameInput";
+
+    private final MainConfig mMainConfig;
+    private final GameWorld mGameWorld;
+    private final DropController mDropController;
+    private final MobsController mMobsController;
+    private final GameItemsHolder mGameItemsHolder;
+    private final Map<String, IUseItemAction> mUseItemActionMap;
+    private final Map<String, IPlaceBlockAction> mPlaceBlockActionMap;
+
+    private final Player mPlayer;
+
+    private ControlMode mControlMode;
+
+    private boolean mKeyDown;
+    private boolean mTouchedDown;
+    private boolean mDragging;
+
+    private int mKeyDownCode;
+    private int mTouchDownBtn;
+    private float mTouchDownX;
+    private float mTouchDownY;
+    private long mTouchDownTime;
+    
+    private int mCreativeScroll;
+
+    @Inject
+    public GameInput(MainConfig mainConfig,
+                     GameWorld gameWorld,
+                     DropController dropController,
+                     MobsController mobsController,
+                     GameItemsHolder gameItemsHolder,
+                     Map<String, IUseItemAction> useItemActionMap,
+                     Map<String, IPlaceBlockAction> placeBlockActionMap) {
+        mMainConfig = mainConfig;
+        mGameWorld = gameWorld;
+        mDropController = dropController;
+        mMobsController = mobsController;
+        mGameItemsHolder = gameItemsHolder;
+        mUseItemActionMap = useItemActionMap;
+        mPlaceBlockActionMap = placeBlockActionMap;
+
+        mPlayer = mMobsController.getPlayer();
+
+        mControlMode = mMainConfig.isTouch() ? ControlMode.WALK : ControlMode.CURSOR;
+    }
 
     private boolean checkSwim() {
-        return GameItems.isFluid(GP.world.getForeMap(GP.player.getMapX(), GP.player.getLowerMapY()));
+        return mGameWorld.getForeMap(mPlayer.getMapX(), mPlayer.getLowerMapY()).isFluid();
     }
 
     private void goUpwards() {
         if (checkSwim()) {
-            GP.player.swim = true;
-        } else if (GP.player.canJump()) {
-            GP.player.getMove().add(0, -7);
-        } else if (!GP.player.isFlyMode() && GP.player.gameMode == 1) {
-            GP.player.setFlyMode(true);
-            GP.player.getMove().y = 0;
-        } else if (GP.player.isFlyMode()) {
-            GP.player.getMove().y = -GamePhysics.PL_SPEED;
+            mPlayer.swim = true;
+        } else if (mPlayer.canJump()) {
+            mPlayer.jump();
+        } else if (!mPlayer.isFlyMode() && mPlayer.gameMode == 1) {
+            mPlayer.setFlyMode(true);
+            mPlayer.getVelocity().y = 0;
+        } else if (mPlayer.isFlyMode()) {
+            mPlayer.getVelocity().y = -mPlayer.getSpeed();
         }
     }
 
     @SuppressWarnings("IntegerDivisionInFloatingPointContext")
     private boolean insideCreativeInv(float screenX, float screenY) {
         TextureRegion creative = Assets.textureRegions.get("creative");
-        return (screenX > GP.renderer.getWidth() / 2 - creative.getRegionWidth() / 2 &&
-                screenX < GP.renderer.getWidth() / 2 + creative.getRegionWidth() / 2 &&
-                screenY > GP.renderer.getHeight() / 2 - creative.getRegionHeight() / 2 &&
-                screenY < GP.renderer.getHeight() / 2 + creative.getRegionHeight() / 2);
+        return (screenX > mMainConfig.getWidth() / 2 - creative.getRegionWidth() / 2 &&
+                screenX < mMainConfig.getWidth() / 2 + creative.getRegionWidth() / 2 &&
+                screenY > mMainConfig.getHeight() / 2 - creative.getRegionHeight() / 2 &&
+                screenY < mMainConfig.getHeight() / 2 + creative.getRegionHeight() / 2);
     }
 
     private void wasdPressed(int keycode) {
-        if (GP.controlMode == ControlMode.WALK || !CaveGame.TOUCH) {
+        if (mControlMode == ControlMode.WALK || !mMainConfig.isTouch()) {
             switch (keycode) {
                 case Input.Keys.A:
-                    GP.player.getMove().x = -GamePhysics.PL_SPEED;
-                    GP.player.setDir(Mob.Direction.LEFT);
-                    if (CaveGame.TOUCH && checkSwim()) GP.player.swim = true;
+                    mPlayer.getVelocity().x = -mPlayer.getSpeed();
+                    mPlayer.setDir(Mob.Direction.LEFT);
+                    if (mMainConfig.isTouch() && checkSwim()) {
+                        mPlayer.swim = true;
+                    }
                     break;
                 case Input.Keys.D:
-                    GP.player.getMove().x = GamePhysics.PL_SPEED;
-                    GP.player.setDir(Mob.Direction.RIGHT);
-                    if (CaveGame.TOUCH && checkSwim()) GP.player.swim = true;
+                    mPlayer.getVelocity().x = mPlayer.getSpeed();
+                    mPlayer.setDir(Mob.Direction.RIGHT);
+                    if (mMainConfig.isTouch() && checkSwim()) {
+                        mPlayer.swim = true;
+                    }
                     break;
                 case Input.Keys.W:
                 case Input.Keys.SPACE:
@@ -74,122 +125,152 @@ public class GameInput {
                     break;
                 case Input.Keys.S:
                 case Input.Keys.CONTROL_LEFT:
-                    GP.player.getMove().y = GamePhysics.PL_SPEED;
+                    mPlayer.getVelocity().y = mPlayer.getSpeed();
                     break;
             }
         } else {
             switch (keycode) {
                 case Input.Keys.A:
-                    curX--;
+                    mPlayer.cursorX--;
                     break;
                 case Input.Keys.D:
-                    curX++;
+                    mPlayer.cursorX++;
                     break;
                 case Input.Keys.W:
-                    curY--;
+                    mPlayer.cursorY--;
                     break;
                 case Input.Keys.S:
-                    curY++;
+                    mPlayer.cursorY++;
                     break;
             }
-            blockDamage = 0;
+            mPlayer.blockDamage = 0;
         }
     }
 
     private boolean isNotAutoselectable(int x, int y) {
-        return (!GP.world.hasForeAt(x, y) || !GP.world.getForeMapBlock(x, y).hasCollision());
+        return (!mGameWorld.hasForeAt(x, y) || !mGameWorld.getForeMap(x, y).hasCollision());
     }
 
     private void checkCursorBounds() {
-        if (curY < 0) {
-            curY = 0;
-        } else if (curY >= GP.world.getHeight()) {
-            curY = GP.world.getHeight() - 1;
+        if (mPlayer.cursorY < 0) {
+            mPlayer.cursorY = 0;
+        } else if (mPlayer.cursorY >= mGameWorld.getHeight()) {
+            mPlayer.cursorY = mGameWorld.getHeight() - 1;
         }
 
-        if (GP.controlMode == ControlMode.CURSOR) {
-            if (curX * 16 + 8 < GP.player.getX() + GP.player.getWidth() / 2) {
-                GP.player.setDir(Mob.Direction.LEFT);
+        if (mControlMode == ControlMode.CURSOR) {
+            if (mPlayer.cursorX * 16 + 8 < mPlayer.getX() + mPlayer.getWidth() / 2) {
+                mPlayer.setDir(Mob.Direction.LEFT);
             } else {
-                GP.player.setDir(Mob.Direction.RIGHT);
+                mPlayer.setDir(Mob.Direction.RIGHT);
             }
         }
     }
 
-    private void moveCursor() {
-        int pastX = curX;
-        int pastY = curY;
+    public void moveCursor(GameRenderer gameRenderer) {
+        int pastX = mPlayer.cursorX;
+        int pastY = mPlayer.cursorY;
 
-        if (GP.controlMode == ControlMode.WALK && CaveGame.TOUCH) {
-            curX = GP.player.getMapX() + (GP.player.looksLeft() ? -1 : 1);
-            curY = GP.player.getUpperMapY();
-            for (int i = 0; i < 2 && isNotAutoselectable(curX, curY); i++) {
-                curY++;
+        if (mControlMode == ControlMode.WALK && mMainConfig.isTouch()) {
+            mPlayer.cursorX = mPlayer.getMapX() + (mPlayer.looksLeft() ? -1 : 1);
+            mPlayer.cursorY = mPlayer.getUpperMapY();
+            for (int i = 0; i < 2 && isNotAutoselectable(mPlayer.cursorX, mPlayer.cursorY); i++) {
+                mPlayer.cursorY++;
             }
-            if (isNotAutoselectable(curX, curY)) {
-                curX += GP.player.looksLeft() ? 1 : -1;
+            if (isNotAutoselectable(mPlayer.cursorX, mPlayer.cursorY)) {
+                mPlayer.cursorX += mPlayer.looksLeft() ? 1 : -1;
             }
-        } else if (!CaveGame.TOUCH) {
-            curX = (int) (Gdx.input.getX() * (GP.renderer.getWidth() / GameScreen.getWidth()) + GP.renderer.getCamX()) / 16;
-            curY = (int) (Gdx.input.getY() * (GP.renderer.getHeight() / GameScreen.getHeight()) + GP.renderer.getCamY()) / 16;
-            if (curX < 0) curX--;
+        } else if (!mMainConfig.isTouch()) {
+            final int tmpX = (int) (Gdx.input.getX() * (mMainConfig.getWidth() /
+                    Gdx.graphics.getWidth()) + gameRenderer.getCamX());
+            mPlayer.cursorX = tmpX / 16;
+
+            final int tmpY = (int) (Gdx.input.getY() * (mMainConfig.getHeight() /
+                    Gdx.graphics.getHeight()) + gameRenderer.getCamY());
+            mPlayer.cursorY = tmpY / 16;
+
+            if (tmpX < 0) {
+                mPlayer.cursorX--;
+            }
+
+            final double a = tmpX - mPlayer.x;
+            final double b = tmpY - mPlayer.y;
+
+            mPlayer.headRotation = (float) Math.atan(b / a) * MathUtils.radDeg;
         }
 
-        if (pastX != curX || pastY != curY) {
-            blockDamage = 0;
+        if (pastX != mPlayer.cursorX || pastY != mPlayer.cursorY) {
+            mPlayer.blockDamage = 0;
         }
 
         checkCursorBounds();
     }
 
-    private void useItem(int x, int y, int id, boolean bg) {
-        String key = getItem(id).isBlock() ? getBlockKey(id) : getItemKey(id);
-        if (id > 0) {
-            if (getItem(id).isBlock()) {
-                if (!bg) {
-                    GP.world.placeToForeground(x, y, getBlockIdByItemId(id));
-                } else {
-                    GP.world.placeToBackground(x, y, getBlockIdByItemId(id));
-                }
+    private void useItem(int x, int y, @CheckForNull Item item, boolean bg) {
+        mPlayer.startHitting();
+
+        if (item == null) {
+            return;
+        }
+
+        if (item instanceof Item.Placeable) {
+            if (!bg) {
+                CommonBlockActionUtilsKt.placeToForegroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
             } else {
-                switch (key) {
-                    case "bucket_water":
-                        GP.world.placeToForeground(x, y, getBlockId("water"));
-                        GP.player.inventory[GP.player.slot] = getItemId("bucket_empty");
-                        break;
-                    case "bucket_lava":
-                        GP.world.placeToForeground(x, y, getBlockId("lava"));
-                        GP.player.inventory[GP.player.slot] = getItemId("bucket_empty");
-                        break;
-                }
+                CommonBlockActionUtilsKt.placeToBackgroundAction(mPlaceBlockActionMap, (Item.Placeable) item, x, y);
+            }
+        } else if (item instanceof Item.Usable) {
+            final String actionKey = ((Item.Usable) item).getUseActionKey();
+            final IUseItemAction useItemAction = mUseItemActionMap.get(actionKey);
+
+            if (useItemAction != null) {
+                useItemAction.perform((Item.Usable) item, x, y);
+            } else {
+                Gdx.app.error(TAG, "use item action " + actionKey + " not found");
             }
         }
     }
 
+    private void hitMobs() {
+        final Player player = mMobsController.getPlayer();
+        mMobsController.getMobs().forEach((mob) -> {
+            if (Intersector.overlaps(mob, player)) {
+                mob.damage(5);
+                mob.jump();
+            }
+        });
+    }
+
     private void pressLMB() {
-        if ((GP.world.hasForeAt(curX, curY) && GP.world.getForeMapBlock(curX, curY).getHp() >= 0) ||
-                (!GP.world.hasForeAt(curX, curY) && GP.world.hasBackAt(curX, curY) &&
-                        GP.world.getBackMapBlock(curX, curY).getHp() >= 0)) {
-            if (GP.player.gameMode == 0) {
-                blockDamage++;
-                if (GP.world.hasForeAt(curX, curY)) {
-                    if (blockDamage >= GP.world.getForeMapBlock(curX, curY).getHp()) {
-                        GP.world.destroyForeMap(curX, curY);
-                        blockDamage = 0;
+        if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE)) {
+            mPlayer.startHitting();
+
+            if ((mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY) && mGameWorld.getForeMap(mPlayer.cursorX, mPlayer.cursorY).getHp() >= 0) ||
+                    (!mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY) && mGameWorld.hasBackAt(mPlayer.cursorX, mPlayer.cursorY) &&
+                            mGameWorld.getBackMap(mPlayer.cursorX, mPlayer.cursorY).getHp() >= 0)) {
+                if (mPlayer.gameMode == 0) {
+                    if (mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY)) {
+                        if (mPlayer.blockDamage >= mGameWorld.getForeMap(mPlayer.cursorX, mPlayer.cursorY).getHp()) {
+                            mGameWorld.destroyForeMap(mPlayer.cursorX, mPlayer.cursorY);
+                            mPlayer.blockDamage = 0;
+                        }
+                    } else if (mGameWorld.hasBackAt(mPlayer.cursorX, mPlayer.cursorY)) {
+                        if (mPlayer.blockDamage >= mGameWorld.getBackMap(mPlayer.cursorX, mPlayer.cursorY).getHp()) {
+                            mGameWorld.destroyBackMap(mPlayer.cursorX, mPlayer.cursorY);
+                            mPlayer.blockDamage = 0;
+                        }
                     }
-                } else if (GP.world.hasBackAt(curX, curY)) {
-                    if (blockDamage >= GP.world.getBackMapBlock(curX, curY).getHp()) {
-                        GP.world.destroyBackMap(curX, curY);
-                        blockDamage = 0;
+                } else {
+                    if (mGameWorld.hasForeAt(mPlayer.cursorX, mPlayer.cursorY)) {
+                        mGameWorld.placeToForeground(mPlayer.cursorX, mPlayer.cursorY, mGameItemsHolder.getFallbackBlock());
+                    } else if (mGameWorld.hasBackAt(mPlayer.cursorX, mPlayer.cursorY)) {
+                        mGameWorld.placeToBackground(mPlayer.cursorX, mPlayer.cursorY, mGameItemsHolder.getFallbackBlock());
                     }
+                    mTouchedDown = false;
                 }
             } else {
-                if (GP.world.hasForeAt(curX, curY)) {
-                    GP.world.placeToForeground(curX, curY, 0);
-                } else if (GP.world.hasBackAt(curX, curY)) {
-                    GP.world.placeToBackground(curX, curY, 0);
-                }
-                touchedDown = false;
+                hitMobs();
+                mTouchedDown = false;
             }
         }
     }
@@ -197,25 +278,25 @@ public class GameInput {
     private boolean insideHotbar(float x, float y) {
         TextureRegion hotbar = Assets.textureRegions.get("hotbar");
         return y < hotbar.getRegionHeight() &&
-                Range.open(GP.renderer.getWidth() / 2 - (float) hotbar.getRegionWidth() / 2,
-                        GP.renderer.getWidth() / 2 + (float) hotbar.getRegionWidth() / 2).contains(x);
+                Range.open(mMainConfig.getWidth() / 2 - (float) hotbar.getRegionWidth() / 2,
+                        mMainConfig.getWidth() / 2 + (float) hotbar.getRegionWidth() / 2).contains(x);
     }
 
     private void holdMB() {
-        if (touchDownBtn == Input.Buttons.RIGHT) {
-            useItem(curX, curY, GP.player.inventory[GP.player.slot], true);
-            touchedDown = false;
+        if (mTouchDownBtn == Input.Buttons.RIGHT) {
+            useItem(mPlayer.cursorX, mPlayer.cursorY, mPlayer.inventory[mPlayer.slot].getItem(), true);
+            mTouchedDown = false;
         } else {
-            if (insideHotbar(touchDownX, touchDownY)) {
-                CaveGame.GAME_STATE = GameState.CREATIVE_INV;
-                touchedDown = false;
+            if (insideHotbar(mTouchDownX, mTouchDownY)) {
+                mMainConfig.setGameUiWindow(GameUiWindow.CREATIVE_INVENTORY);
+                mTouchedDown = false;
             }
         }
     }
 
     public void keyDown(int keycode) {
-        keyDown = true;
-        keyDownCode = keycode;
+        mKeyDown = true;
+        mKeyDownCode = keycode;
         switch (keycode) {
             case Input.Keys.A:
             case Input.Keys.D:
@@ -227,46 +308,47 @@ public class GameInput {
                 break;
 
             case Input.Keys.ALT_LEFT:
-                if (CaveGame.TOUCH) {
-                    GP.controlMode = GP.controlMode == ControlMode.WALK ? ControlMode.CURSOR : ControlMode.WALK;
+                if (mMainConfig.isTouch()) {
+                    mControlMode = mControlMode == ControlMode.WALK ? ControlMode.CURSOR : ControlMode.WALK;
                 }
                 break;
 
             case Input.Keys.E:
-                if (CaveGame.GAME_STATE == GameState.PLAY) {
-                    switch (GP.player.gameMode) {
+                if (mMainConfig.checkGameUiWindow(GameUiWindow.NONE)) {
+                    switch (mPlayer.gameMode) {
                         case 0:
                             //TODO survival inv
                             break;
                         case 1:
-                            CaveGame.GAME_STATE = GameState.CREATIVE_INV;
+                            mMainConfig.setGameUiWindow(GameUiWindow.CREATIVE_INVENTORY);
                             break;
                     }
                 } else {
-                    CaveGame.GAME_STATE = GameState.PLAY;
+                    mMainConfig.setGameUiWindow(GameUiWindow.NONE);
                 }
                 break;
 
             case Input.Keys.G:
-                GP.mobs.add(new Pig(curX * 16, curY * 16));
+                final Mob pig = new Pig(mPlayer.cursorX * 16, mPlayer.cursorY * 16);
+                pig.attachToController(mMobsController);
                 break;
 
-            case Input.Keys.Q:
-                GP.world.placeToForeground(curX, curY, 8);
+            case Input.Keys.GRAVE:
+                mMobsController.getPlayer().gameMode = (mMobsController.getPlayer().gameMode + 1) % 2;
                 break;
 
             case Input.Keys.ESCAPE:
             case Input.Keys.BACK:
-                CaveGame.APP_STATE = AppState.SAVE;
-                CaveGame.GAME_STATE = GameState.PAUSE;
+                GameSaver.save(mMainConfig, mDropController, mMobsController, mGameWorld);
+                mMainConfig.getCaveGame().quitGame();
                 break;
 
             case Input.Keys.F1:
-                GameScreen.SHOW_DEBUG = !GameScreen.SHOW_DEBUG;
+                mMainConfig.setShowInfo(!mMainConfig.isShowInfo());
                 break;
 
             case Input.Keys.M:
-                GameScreen.SHOW_MAP = !GameScreen.SHOW_MAP;
+                mMainConfig.setShowMap(!mMainConfig.isShowMap());
                 break;
         }
     }
@@ -275,120 +357,153 @@ public class GameInput {
         switch (keycode) {
             case Input.Keys.A:
             case Input.Keys.D:
-                GP.player.getMove().x = 0;
-                if (CaveGame.TOUCH && GP.player.swim) GP.player.swim = false;
+                mPlayer.getVelocity().x = 0;
+                if (mMainConfig.isTouch() && mPlayer.swim) {
+                    mPlayer.swim = false;
+                }
                 break;
 
             case Input.Keys.W:
             case Input.Keys.S:
             case Input.Keys.SPACE:
             case Input.Keys.CONTROL_LEFT:
-                if (GP.player.isFlyMode()) GP.player.getMove().y = 0;
-                if (GP.player.swim) GP.player.swim = false;
+                if (mPlayer.isFlyMode()) {
+                    mPlayer.getVelocity().y = 0;
+                }
+                if (mPlayer.swim) {
+                    mPlayer.swim = false;
+                }
                 break;
         }
     }
 
     public void touchDown(float touchX, float touchY, int button) {
-        touchDownTime = TimeUtils.millis();
-        touchedDown = true;
-        touchDownBtn = button;
-        touchDownX = touchX;
-        touchDownY = touchY;
+        mTouchDownTime = TimeUtils.millis();
+        mTouchedDown = true;
+        mTouchDownBtn = button;
+        mTouchDownX = touchX;
+        mTouchDownY = touchY;
     }
 
     public void touchUp(float screenX, float screenY, int button) {
-        if (CaveGame.TOUCH && keyDown) {
-            keyUp(keyDownCode);
-            keyDown = false;
+        if (mDragging) {
+            mDragging = false;
+            return;
+        }
+
+        if (mMainConfig.isTouch() && mKeyDown) {
+            keyUp(mKeyDownCode);
+            mKeyDown = false;
         }
         TextureRegion hotbar = Assets.textureRegions.get("hotbar");
         TextureRegion creative = Assets.textureRegions.get("creative");
-        if (touchedDown) {
-            if (CaveGame.GAME_STATE == GameState.CREATIVE_INV && insideCreativeInv(screenX, screenY)) {
-                int ix = (int) (screenX - (GP.renderer.getWidth() / 2 - creative.getRegionWidth() / 2 + 8)) / 18;
-                int iy = (int) (screenY - (GP.renderer.getHeight() / 2 - creative.getRegionHeight() / 2 + 18)) / 18;
-                int item = creativeScroll * 8 + (ix + iy * 8);
-                if (ix >= 8 || ix < 0 || iy < 0 || iy >= 5) item = -1;
-                if (item >= 0 && item < GameItems.getItemsSize()) {
-                    System.arraycopy(GP.player.inventory, 0, GP.player.inventory, 1, 8);
-                    GP.player.inventory[0] = item;
+        if (mTouchedDown) {
+            if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY) && insideCreativeInv(screenX, screenY)) {
+                int ix = (int) (screenX - (mMainConfig.getWidth() / 2 - creative.getRegionWidth() / 2 + 8)) / 18;
+                int iy = (int) (screenY - (mMainConfig.getHeight() / 2 - creative.getRegionHeight() / 2 + 18)) / 18;
+                int itemPos = mCreativeScroll * 8 + (ix + iy * 8);
+                if (ix >= 8 || ix < 0 || iy < 0 || iy >= 5) {
+                    itemPos = -1;
                 }
-            } else if (CaveGame.GAME_STATE == GameState.CREATIVE_INV) {
-                CaveGame.GAME_STATE = GameState.PLAY;
+
+                System.arraycopy(mPlayer.inventory, 0, mPlayer.inventory, 1, 8);
+                mPlayer.inventory[0] = mGameItemsHolder.getItemFromCreativeInventory(itemPos).toInventoryItem();
+            } else if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY)) {
+                mMainConfig.setGameUiWindow(GameUiWindow.NONE);
             } else if (screenY < hotbar.getRegionHeight() &&
-                    screenX > GP.renderer.getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 &&
-                    screenX < GP.renderer.getWidth() / 2 + (float) hotbar.getRegionWidth() / 2) {
-                GP.player.slot = (int) ((screenX - (GP.renderer.getWidth() / 2 - hotbar.getRegionWidth() / 2)) / 20);
+                    screenX > mMainConfig.getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 &&
+                    screenX < mMainConfig.getWidth() / 2 + (float) hotbar.getRegionWidth() / 2) {
+                mPlayer.slot = (int) ((screenX - (mMainConfig.getWidth() / 2 - hotbar.getRegionWidth() / 2)) / 20);
             } else if (button == Input.Buttons.RIGHT) {
-                useItem(curX, curY,
-                        GP.player.inventory[GP.player.slot], false);
+                useItem(mPlayer.cursorX, mPlayer.cursorY,
+                        mPlayer.inventory[mPlayer.slot].getItem(), false);
             } else if (button == Input.Buttons.LEFT) {
-                blockDamage = 0;
+                mPlayer.stopHitting();
+                mPlayer.blockDamage = 0;
             }
         }
-        touchedDown = false;
+        mTouchedDown = false;
     }
 
     public void touchDragged(float screenX, float screenY) {
-        if (CaveGame.GAME_STATE == GameState.CREATIVE_INV && Math.abs(screenY - touchDownY) > 16) {
+        if (Math.abs(screenX - mTouchDownX) < 16 && Math.abs(screenY - mTouchDownY) < 16) {
+            return;
+        }
+
+        mDragging = true;
+        if (mMainConfig.checkGameUiWindow(GameUiWindow.CREATIVE_INVENTORY) && Math.abs(screenY - mTouchDownY) > 16) {
             if (insideCreativeInv(screenX, screenY)) {
-                creativeScroll -= (screenY - touchDownY) / 16;
-                touchDownX = screenX;
-                touchDownY = screenY;
-                if (creativeScroll < 0) creativeScroll = 0;
-                if (creativeScroll > GameProc.MAX_CREATIVE_SCROLL)
-                    creativeScroll = GameProc.MAX_CREATIVE_SCROLL;
+                mCreativeScroll -= (screenY - mTouchDownY) / 16;
+                mTouchDownX = screenX;
+                mTouchDownY = screenY;
+                if (mCreativeScroll < 0) {
+                    mCreativeScroll = 0;
+                }
+
+                final int maxScroll = mGameItemsHolder.getCreativeScrollAmount();
+                if (mCreativeScroll > maxScroll) {
+                    mCreativeScroll = maxScroll;
+                }
             }
         }
     }
 
-    public void scrolled(int amount) {
-        switch (CaveGame.GAME_STATE) {
-            case PLAY:
-                GP.player.slot += amount;
-                if (GP.player.slot < 0) GP.player.slot = 8;
-                if (GP.player.slot > 8) GP.player.slot = 0;
+    public void scrolled(float amountX, float amountY) {
+        switch (mMainConfig.getGameUiWindow()) {
+            case NONE:
+                mPlayer.slot += (int) amountY;
+                if (mPlayer.slot < 0) {
+                    mPlayer.slot = 8;
+                }
+                if (mPlayer.slot > 8) {
+                    mPlayer.slot = 0;
+                }
                 break;
-            case CREATIVE_INV:
-                creativeScroll += amount;
-                if (creativeScroll < 0) creativeScroll = 0;
-                if (creativeScroll > GameProc.MAX_CREATIVE_SCROLL)
-                    creativeScroll = GameProc.MAX_CREATIVE_SCROLL;
+            case CREATIVE_INVENTORY:
+                mCreativeScroll += (int) amountY;
+                if (mCreativeScroll < 0) {
+                    mCreativeScroll = 0;
+                }
+
+                final int maxScroll = mGameItemsHolder.getCreativeScrollAmount();
+                if (mCreativeScroll > maxScroll) {
+                    mCreativeScroll = maxScroll;
+                }
                 break;
         }
     }
 
     public int getKeyDownCode() {
-        return keyDownCode;
+        return mKeyDownCode;
     }
 
     public boolean isKeyDown() {
-        return keyDown;
+        return mKeyDown;
     }
 
-    int getBlockDamage() {
-        return blockDamage;
+    public int getCreativeScroll() {
+        return mCreativeScroll;
     }
 
-    int getCurX() {
-        return curX;
+    public ControlMode getControlMode() {
+        return mControlMode;
     }
 
-    int getCurY() {
-        return curY;
-    }
-
-    int getCreativeScroll() {
-        return creativeScroll;
+    public void setControlMode(ControlMode controlMode) {
+        mControlMode = controlMode;
     }
 
     void update() {
-        moveCursor();
-        if (touchedDown && touchDownBtn == Input.Buttons.LEFT) {
+        if (!mTouchedDown) {
+            mPlayer.stopHitting();
+            return;
+        }
+
+        if (mTouchDownBtn == Input.Buttons.LEFT) {
             pressLMB();
         }
-        if (touchedDown && TimeUtils.timeSinceMillis(touchDownTime) > 500) {
+
+        if (mTouchedDown && TimeUtils.timeSinceMillis(mTouchDownTime) > 500) {
             holdMB();
         }
     }