X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameRenderer.java;h=ca9cf8b392c231dfc564ef3120eff9ba90469ec2;hb=894d9f1babeff18c9cbb5f83206ff2c549de0bdb;hp=9e54c9a5a74a54f4932f609124bc89088740acfe;hpb=084218324e5251bde73361f90549563c16026b34;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
index 9e54c9a..ca9cf8b 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameRenderer.java
@@ -3,20 +3,58 @@ package ru.deadsoftware.cavedroid.game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.GL20;
+import com.badlogic.gdx.graphics.g2d.Sprite;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
-import ru.deadsoftware.cavedroid.CaveGame;
-import ru.deadsoftware.cavedroid.GameScreen;
+import com.badlogic.gdx.math.Intersector;
+import com.badlogic.gdx.math.MathUtils;
+import com.badlogic.gdx.math.Rectangle;
+import com.badlogic.gdx.math.Vector2;
+import com.badlogic.gdx.scenes.scene2d.utils.ScissorStack;
+import ru.deadsoftware.cavedroid.MainConfig;
 import ru.deadsoftware.cavedroid.game.mobs.Mob;
+import ru.deadsoftware.cavedroid.game.mobs.MobsController;
+import ru.deadsoftware.cavedroid.game.mobs.Player;
+import ru.deadsoftware.cavedroid.game.objects.Block;
 import ru.deadsoftware.cavedroid.game.objects.Drop;
-import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.game.objects.DropController;
+import ru.deadsoftware.cavedroid.game.objects.Item;
+import ru.deadsoftware.cavedroid.game.world.GameWorld;
+import ru.deadsoftware.cavedroid.misc.ControlMode;
 import ru.deadsoftware.cavedroid.misc.Renderer;
+import ru.deadsoftware.cavedroid.misc.utils.SpriteUtilsKt;
 
-import static ru.deadsoftware.cavedroid.GameScreen.GP;
+import javax.annotation.CheckForNull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
 
+import static ru.deadsoftware.cavedroid.misc.Assets.*;
+
+@GameScope
 public class GameRenderer extends Renderer {
 
-    GameRenderer(float width, float height) {
-        super(width, height);
+    private static final String TAG = "GameRenderer";
+
+    private final MainConfig mMainConfig;
+    private final GameInput mGameInput;
+    private final GameWorld mGameWorld;
+    private final MobsController mMobsController;
+    private final DropController mDropController;
+
+    @Inject
+    GameRenderer(MainConfig mainConfig,
+                 GameInput gameInput,
+                 GameWorld gameWorld,
+                 MobsController mobsController,
+                 DropController dropController) {
+        super(mainConfig.getWidth(), mainConfig.getHeight());
+
+        mMainConfig = mainConfig;
+        mGameInput = gameInput;
+        mGameWorld = gameWorld;
+        mMobsController = mobsController;
+        mDropController = dropController;
+
         Gdx.gl.glClearColor(0f, .6f, .6f, 1f);
     }
 
@@ -29,28 +67,34 @@ public class GameRenderer extends Renderer {
     }
 
     private void drawWreck(int bl) {
-        if (GP.blockDmg > 0) {
-            spriter.draw(Assets.wreck[
-                            10 * GP.blockDmg /
-                                    GameItems.getBlock(bl).getHp()],
-                    GP.curX * 16 - getCamX(),
-                    GP.curY * 16 - getCamY());
+        if (mGameInput.getBlockDamage() > 0) {
+            int index = 10 * mGameInput.getBlockDamage() / GameItems.getBlock(bl).getHp();
+            String key = "break_" + index;
+
+            if (index > 10 || index < 0) {
+                return;
+            }
+
+            spriter.draw(textureRegions.get(key), mGameInput.getCurX() * 16 - getCamX(),
+                    mGameInput.getCurY() * 16 - getCamY());
         }
     }
 
     private void drawBlock(int x, int y, boolean drawBG) {
         if (drawBG) {
-            if ((GP.world.getForeMap(x, y) == 0 || GameItems.getBlock(GP.world.getForeMap(x, y)).isTransparent())
-                    && GP.world.getBackMap(x, y) > 0) {
-                spriter.draw(GameItems.getBlock(GP.world.getBackMap(x, y)).getTex(), drawX(x), drawY(y));
-                if (GP.world.getForeMap(x, y) == 0 && x == GP.curX && y == GP.curY)
-                    drawWreck(GP.world.getBackMap(GP.curX, GP.curY));
+            if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMapBlock(x, y).isTransparent())
+                    && mGameWorld.hasBackAt(x, y)) {
+                mGameWorld.getBackMapBlock(x, y).draw(spriter, drawX(x), drawY(y));
+                if (!mGameWorld.hasForeAt(x, y) && x == mGameInput.getCurX() && y == mGameInput.getCurY()) {
+                    drawWreck(mGameWorld.getBackMap(mGameInput.getCurX(), mGameInput.getCurY()));
+                }
             }
         }
-        if (GP.world.getForeMap(x, y) > 0 && GameItems.getBlock(GP.world.getForeMap(x, y)).isBackground() == drawBG) {
-            spriter.draw(GameItems.getBlock(GP.world.getForeMap(x, y)).getTex(), drawX(x), drawY(y));
-            if (x == GP.curX && y == GP.curY)
-                drawWreck(GP.world.getForeMap(GP.curX, GP.curY));
+        if (mGameWorld.hasForeAt(x, y) && mGameWorld.getForeMapBlock(x, y).isBackground() == drawBG) {
+            mGameWorld.getForeMapBlock(x, y).draw(spriter, drawX(x), drawY(y));
+            if (x == mGameInput.getCurX() && y == mGameInput.getCurY()) {
+                drawWreck(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY()));
+            }
         }
     }
 
@@ -59,8 +103,12 @@ public class GameRenderer extends Renderer {
         int minY = (int) (getCamY() / 16) - 1;
         int maxX = (int) ((getCamX() + getWidth()) / 16) + 1;
         int maxY = (int) ((getCamY() + getHeight()) / 16) + 1;
-        if (minY < 0) minY = 0;
-        if (maxY > GP.world.getHeight()) maxY = GP.world.getHeight();
+        if (minY < 0) {
+            minY = 0;
+        }
+        if (maxY > mGameWorld.getHeight()) {
+            maxY = mGameWorld.getHeight();
+        }
         for (int y = minY; y < maxY; y++) {
             for (int x = minX; x < maxX; x++) {
                 drawBlock(x, y, bg);
@@ -74,9 +122,10 @@ public class GameRenderer extends Renderer {
             shaper.setColor(0f, 0f, 0f, .5f);
             for (int y = minY; y < maxY; y++) {
                 for (int x = minX; x < maxX; x++) {
-                    if ((GP.world.getForeMap(x, y) == 0 || GameItems.getBlock(GP.world.getForeMap(x, y)).isTransparent())
-                            && GP.world.getBackMap(x, y) > 0)
+                    if ((!mGameWorld.hasForeAt(x, y) || mGameWorld.getForeMapBlock(x, y).isTransparent())
+                            && mGameWorld.hasBackAt(x, y)) {
                         shaper.rect(drawX(x), drawY(y), 16, 16);
+                    }
                 }
             }
             shaper.end();
@@ -85,166 +134,289 @@ public class GameRenderer extends Renderer {
         }
     }
 
-    private void drawMob(Mob mob) {
-        float mobDrawX = mob.pos.x - getCamX();
-        float mobDrawY = mob.pos.y - getCamY();
+    private Rectangle getShiftedRectRespectfulToViewPort(final Rectangle rect, final float shift) {
+        return new Rectangle(rect.x + shift - getCamX(), rect.y - getCamY(), rect.width, rect.height);
+    }
+
+    @CheckForNull
+    private Rectangle getDrawingRectIfInsideViewport(final Rectangle rectangle) {
+        final Rectangle viewportRect = new Rectangle(0, 0, getWidth(), getHeight());
+
+        final Rectangle notShifted = getShiftedRectRespectfulToViewPort(rectangle, 0);
+        if (Intersector.overlaps(viewportRect, notShifted)) {
+            return notShifted;
+        }
+
+        final Rectangle shiftedLeft = getShiftedRectRespectfulToViewPort(rectangle, -mGameWorld.getWidthPx());
+        if (Intersector.overlaps(viewportRect, shiftedLeft)) {
+            return shiftedLeft;
+        }
+
+        final Rectangle shiftedRight = getShiftedRectRespectfulToViewPort(rectangle, mGameWorld.getWidthPx());
+        if (Intersector.overlaps(viewportRect, shiftedRight)) {
+            return shiftedRight;
+        }
+
+        return null;
+    }
 
-        if (mobDrawX + mob.getWidth() - GP.world.getWidthPx() >= 0 && mobDrawX - GP.world.getWidthPx() <= getWidth())
-            mob.draw(spriter, mobDrawX - GP.world.getWidthPx(), mobDrawY);
+    private void drawMob(Mob mob, float delta) {
+        float mobDrawX = mob.getX() - getCamX();
+        float mobDrawY = mob.getY() - getCamY();
 
-        if (mobDrawX + mob.getWidth() >= 0 && mobDrawX <= getWidth())
-            mob.draw(spriter, mobDrawX, mobDrawY);
+        if (mobDrawX + mob.getWidth() < 0 && mobDrawX + mGameWorld.getWidthPx() > 0) {
+            mobDrawX += mGameWorld.getWidthPx();
+        } else if (mobDrawX > getWidth() && mobDrawX + mob.getWidth() - mGameWorld.getWidthPx() > 0) {
+            mobDrawX -= mGameWorld.getWidthPx();
+        } else if (mobDrawX + mob.getWidth() < 0 && mobDrawX > getWidth()) {
+            return;
+        }
 
-        if (mobDrawX + mob.getWidth() + GP.world.getWidthPx() >= 0 && mobDrawX + GP.world.getWidthPx() <= getWidth())
-            mob.draw(spriter, mobDrawX + GP.world.getWidthPx(), mobDrawY);
+        mob.draw(spriter, mobDrawX, mobDrawY, delta);
     }
 
     private void drawDrop(Drop drop) {
+        if (drop.getId() <= 0) {
+            return;
+        }
+
+        @CheckForNull final Rectangle drawingRect = getDrawingRectIfInsideViewport(drop);
+
+        if (drawingRect == null) {
+            return;
+        }
+
+        final Item item = GameItems.getItem(drop.getId());
+        @CheckForNull final Block block = GameItems.getBlock(GameItems.getItemKey(drop.getId()));
+        @CheckForNull final Sprite sprite = item.isBlock()
+                ? block.getTexture()
+                : item.getSprite();
+
+        if (sprite == null) {
+            return;
+        }
+
+        sprite.setPosition(drawingRect.x, drawingRect.y);
+        sprite.setSize(drawingRect.width, drawingRect.height);
+        sprite.draw(spriter);
     }
 
     @SuppressWarnings("IntegerDivisionInFloatingPointContext")
     private void drawCreative() {
-        float x = getWidth() / 2 - (float) Assets.creativeInv.getRegionWidth() / 2;
-        float y = getHeight() / 2 - (float) Assets.creativeInv.getRegionHeight() / 2;
-        spriter.draw(Assets.creativeInv, x, y);
-        spriter.draw(Assets.creativeScr, x + 156,
-                y + 18 + (GP.creativeScroll * (72f / GP.maxCreativeScroll)));
-        for (int i = GP.creativeScroll * 8; i < GP.creativeScroll * 8 + 40; i++) {
-            if (i > 0 && i < GameItems.getItemsSize())
+        TextureRegion creative = textureRegions.get("creative");
+        float x = getWidth() / 2 - (float) creative.getRegionWidth() / 2;
+        float y = getHeight() / 2 - (float) creative.getRegionHeight() / 2;
+        spriter.draw(creative, x, y);
+        spriter.draw(textureRegions.get("handle"), x + 156,
+                y + 18 + (mGameInput.getCreativeScroll() * (72f / GameProc.MAX_CREATIVE_SCROLL)));
+        for (int i = mGameInput.getCreativeScroll() * 8; i < mGameInput.getCreativeScroll() * 8 + 40; i++) {
+            if (i > 0 && i < GameItems.getItemsSize()) {
                 if (GameItems.getItem(i).isBlock()) {
-                    spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTex(),
-                            x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18,
-                            y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
+                    spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(i)).getTexture(),
+                            x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18,
+                            y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18);
                 } else {
-                    spriter.draw(GameItems.getItem(i).getTex(),
-                            x + 8 + ((i - GP.creativeScroll * 8) % 8) * 18,
-                            y + 18 + ((i - GP.creativeScroll * 8) / 8) * 18);
+                    spriter.draw(GameItems.getItem(i).getTexture(),
+                            x + 8 + ((i - mGameInput.getCreativeScroll() * 8) % 8) * 18,
+                            y + 18 + ((i - mGameInput.getCreativeScroll() * 8) / 8) * 18);
                 }
+            }
         }
         for (int i = 0; i < 9; i++) {
-            if (GP.player.inv[i] > 0)
-                if (GameItems.getItem(GP.player.inv[i]).isBlock()) {
-                    spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inv[i])).getTex(),
-                            x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
+            if (mMobsController.getPlayer().inventory[i] > 0) {
+                if (GameItems.getItem(mMobsController.getPlayer().inventory[i]).isBlock()) {
+                    spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(mMobsController.getPlayer().inventory[i])).getTexture(),
+                            x + 8 + i * 18, y + creative.getRegionHeight() - 24);
                 } else {
-                    spriter.draw(GameItems.getItem(GP.player.inv[i]).getTex(),
-                            x + 8 + i * 18, y + Assets.creativeInv.getRegionHeight() - 24);
+                    spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getTexture(),
+                            x + 8 + i * 18, y + creative.getRegionHeight() - 24);
                 }
+            }
+        }
+
+    }
+
+    private void drawHealth(float x, float y) {
+        Player player = mMobsController.getPlayer();
+
+        if (player.gameMode == 1) {
+            return;
         }
 
+        TextureRegion wholeHeart = textureRegions.get("heart_whole");
+        TextureRegion halfHeart = textureRegions.get("heart_half");
+
+        int wholeHearts = player.getHealth() / 2;
+
+        for (int i = 0; i < wholeHearts; i++) {
+            spriter.draw(wholeHeart, x + i * wholeHeart.getRegionWidth(), y);
+        }
+
+        if (player.getHealth() % 2 == 1) {
+            spriter.draw(halfHeart, x + wholeHearts * wholeHeart.getRegionWidth(), y);
+        }
     }
 
     private void drawGUI() {
-        if (GP.world.getForeMap(GP.curX, GP.curY) > 0 ||
-                GP.world.getBackMap(GP.curX, GP.curY) > 0 ||
-                GP.ctrlMode == 1 ||
-                !CaveGame.TOUCH)
-            spriter.draw(Assets.guiCur,
-                    GP.curX * 16 - getCamX(),
-                    GP.curY * 16 - getCamY());
-        spriter.draw(Assets.invBar, getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2, 0);
+        TextureRegion cursor = textureRegions.get("cursor");
+        TextureRegion hotbar = textureRegions.get("hotbar");
+        TextureRegion hotbarSelector = textureRegions.get("hotbar_selector");
+
+        if (mGameWorld.hasForeAt(mGameInput.getCurX(), mGameInput.getCurY()) ||
+                mGameWorld.hasBackAt(mGameInput.getCurX(), mGameInput.getCurY()) ||
+                mGameInput.getControlMode() == ControlMode.CURSOR || mMainConfig.isTouch()) {
+            spriter.draw(cursor, mGameInput.getCurX() * 16 - getCamX(), mGameInput.getCurY() * 16 - getCamY());
+        }
+
+        float hotbarX = getWidth() / 2 - (float) hotbar.getRegionWidth() / 2;
+        spriter.draw(hotbar, hotbarX, 0);
+        drawHealth(hotbarX, hotbar.getRegionHeight());
+
         for (int i = 0; i < 9; i++) {
-            if (GP.player.inv[i] > 0) {
-                if (GameItems.getItem(GP.player.inv[i]).isBlock()) {
-                    spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(GP.player.inv[i])).getTex(),
-                            getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
+            if (mMobsController.getPlayer().inventory[i] > 0) {
+                if (GameItems.getItem(mMobsController.getPlayer().inventory[i]).isBlock()) {
+                    spriter.draw(GameItems.getBlock(GameItems.getBlockIdByItemId(mMobsController.getPlayer().inventory[i])).getTexture(),
+                            getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20,
                             3);
                 } else {
-                    spriter.draw(GameItems.getItem(GP.player.inv[i]).getTex(),
-                            getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 + 3 + i * 20,
+                    spriter.draw(GameItems.getItem(mMobsController.getPlayer().inventory[i]).getTexture(),
+                            getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 + 3 + i * 20,
                             3);
                 }
             }
         }
-        spriter.draw(Assets.invBarCur,
-                getWidth() / 2 - (float) Assets.invBar.getRegionWidth() / 2 - 1 + 20 * GP.player.invSlot,
+        spriter.draw(hotbarSelector,
+                getWidth() / 2 - (float) hotbar.getRegionWidth() / 2 - 1 + 20 * mMobsController.getPlayer().slot,
                 -1);
     }
 
     private void drawTouchGui() {
-        spriter.draw(Assets.touchArrows[0], 26, getHeight() - 52);
-        spriter.draw(Assets.touchArrows[1], 0, getHeight() - 26);
-        spriter.draw(Assets.touchArrows[2], 26, getHeight() - 26);
-        spriter.draw(Assets.touchArrows[3], 52, getHeight() - 26);
-        spriter.draw(Assets.touchLMB, getWidth() - 52, getHeight() - 26);
-        spriter.draw(Assets.touchRMB, getWidth() - 26, getHeight() - 26);
-        spriter.draw(Assets.touchMode, 78, getHeight() - 26);
-        if (GP.ctrlMode == 1) {
-            spriter.draw(Assets.shade, 83, getHeight() - 21);
+        for (int i = 0; i < guiMap.size; i++) {
+            Rectangle touchKey = guiMap.getValueAt(i).getRect();
+            spriter.draw(textureRegions.get(guiMap.getKeyAt(i)),
+                    touchKey.x, touchKey.y, touchKey.width, touchKey.height);
+        }
+        if (mGameInput.getControlMode() == ControlMode.CURSOR) {
+            spriter.draw(textureRegions.get("shade"), 83, getHeight() - 21);
         }
     }
 
-    private void drawGamePlay() {
+    private void drawGamePlay(float delta) {
+        Player player = mMobsController.getPlayer();
+
         drawWorld(true);
-        GP.player.draw(spriter, GP.player.pos.x - getCamX() - 2, GP.player.pos.y - getCamY());
-        for (Mob mob : GP.mobs) drawMob(mob);
-        for (Drop drop : GP.drops) drawDrop(drop);
+        player.draw(spriter, player.getX() - getCamX() - player.getWidth() / 2, player.getY() - getCamY(), delta);
+        mMobsController.getMobs().forEach( (mob) -> { drawMob(mob, delta); });
+        mDropController.forEach(this::drawDrop);
         drawWorld(false);
         drawGUI();
     }
 
+    private void updateCameraPosition() {
+        Player player = mMobsController.getPlayer();
+        setCamPos(player.getX() + player.getWidth() / 2 - getWidth() / 2,
+                player.getY() + player.getHeight() / 2 - getHeight() / 2);
+    }
+
+    @Nullable
+    private Color getMinimapColor(int x, int y) {
+        @Nullable Color result = null;
+
+        final boolean hasForeMap = mGameWorld.hasForeAt(x, y);
+        final boolean hasBackMap = mGameWorld.hasBackAt(x, y);
+
+        if (hasForeMap) {
+            final Block block = mGameWorld.getForeMapBlock(x, y);
+
+            if (GameItems.isWater(block)) {
+                result = Color.BLUE;
+            } else if (GameItems.isLava(block)) {
+                result = Color.RED;
+            } else {
+                result = Color.BLACK;
+            }
+        } else if (hasBackMap) {
+            result = Color.DARK_GRAY;
+        }
+
+        return result;
+    }
+
+    private void drawMiniMap(float miniMapX, float miniMapY, float size) {
+        shaper.begin(ShapeRenderer.ShapeType.Filled);
+
+        shaper.setColor(Color.LIGHT_GRAY);
+        shaper.rect(miniMapX, miniMapY, size, size);
+
+        for (int x = 0; x < size; x++) {
+            for (int y = 0; y < size; y++) {
+
+                final int worldX = (int) (mMobsController.getPlayer().getMapX() - size / 2 + x);
+                final int worldY = (int) (mMobsController.getPlayer().getUpperMapY() - size / 2 + y);
+
+                @Nullable
+                final Color color = getMinimapColor(worldX, worldY);
+
+                if (color != null) {
+                    shaper.setColor(color);
+                    shaper.rect(miniMapX + x, miniMapY + y, 1, 1);
+                }
+            }
+        }
+
+        shaper.setColor(Color.OLIVE);
+        shaper.rect(miniMapX + size / 2, miniMapY + size / 2, 1, 2);
+        shaper.end();
+    }
+
     @Override
-    public void render() {
+    public void render(float delta) {
+        int fps = MathUtils.ceil(1 / delta);
+        updateCameraPosition();
+        mGameInput.moveCursor(this);
+
         Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
 
         spriter.begin();
-        switch (CaveGame.STATE) {
-            case GAME_PLAY:
-                drawGamePlay();
-                break;
-            case GAME_CREATIVE_INV:
-                drawGamePlay();
+
+        drawGamePlay(delta);
+
+        switch (mMainConfig.getGameUiWindow()) {
+            case CREATIVE_INVENTORY:
                 drawCreative();
                 break;
+            //TODO draw other ui windows
         }
 
-        if (CaveGame.TOUCH) drawTouchGui();
+
+        if (mMainConfig.isTouch()) {
+            drawTouchGui();
+        }
 
         spriter.end();
 
-        if(GameScreen.SHOW_MAP) {
-            //DRAW MAP
-            shaper.begin(ShapeRenderer.ShapeType.Filled);
-            shaper.setColor(Color.LIGHT_GRAY);
-            shaper.rect(0, 0, GP.world.getWidth(), 128);
-            for (int y = 128; y < 256; y++) {
-                for (int x = 0; x < getWidth(); x++) {
-                    if (GP.world.getForeMap(x, y) > 0 || GP.world.getBackMap(x, y) > 0) {
-                        if (GameItems.isWater(GP.world.getForeMap(x, y))) {
-                            shaper.setColor(Color.BLUE);
-                        } else if (GameItems.isLava(GP.world.getForeMap(x, y))) {
-                            shaper.setColor(Color.RED);
-                        } else {
-                            if (GP.world.getForeMap(x, y) > 0) {
-                                shaper.setColor(Color.BLACK);
-                            } else {
-                                shaper.setColor(Color.DARK_GRAY);
-                            }
-                        }
-                        shaper.rect(x, y - 128, 1, 1);
-                    }
-                }
-            }
-            shaper.setColor(Color.OLIVE);
-            shaper.rect(GP.player.pos.x / 16, GP.player.pos.y / 16 - 128, 1, 2);
-            shaper.end();
-            //=================
+        if (mMainConfig.isShowMap()) {
+            drawMiniMap(getWidth() - 64f - 24f, 24f, 64f);
         }
-        spriter.begin();
 
-        if (GameScreen.SHOW_DEBUG) {
-            drawString("FPS: " + GameScreen.FPS, 0, 0);
-            drawString("X: " + (int) (GP.player.pos.x / 16), 0, 10);
-            drawString("Y: " + (int) (GP.player.pos.y / 16), 0, 20);
-            drawString("CurX: " + GP.curX, 0, 30);
-            drawString("CurY: " + GP.curY, 0, 40);
-            drawString("Mobs: " + GP.mobs.size(), 0, 50);
-            drawString("Drops: " + GP.drops.size(), 0, 60);
-            drawString("Block: " + GameItems.getBlockKey(GP.world.getForeMap(GP.curX, GP.curY)), 0, 70);
-            drawString("Game mode: " + GP.player.gameMode, 0, 80);
+        if (mMainConfig.isShowInfo()) {
+            spriter.begin();
+            Player player = mMobsController.getPlayer();
+            drawString("FPS: " + fps, 0, 0);
+            drawString("X: " + player.getMapX(), 0, 10);
+            drawString("Y: " + player.getUpperMapY(), 0, 20);
+            drawString("CurX: " + mGameInput.getCurX(), 0, 30);
+            drawString("CurY: " + mGameInput.getCurY(), 0, 40);
+            drawString("Velocity: " + player.getVelocity(), 0, 50);
+            drawString("Swim: " + player.swim, 0, 60);
+            drawString("Mobs: " + mMobsController.getMobs().size(), 0, 70);
+            drawString("Drops: " + mDropController.getSize(), 0, 80);
+            drawString("Block: " + GameItems.getBlockKey(mGameWorld.getForeMap(mGameInput.getCurX(), mGameInput.getCurY())), 0, 90);
+            drawString("Hand: " + GameItems.getItemKey(mMobsController.getPlayer().inventory[mMobsController.getPlayer().slot]), 0, 100);
+            drawString("Game mode: " + player.gameMode, 0, 110);
+            drawString("Check swim: " + GameItems.isFluid(mGameWorld.getForeMap(player.getMapX(), player.getLowerMapY())), 0, 120);
+            spriter.end();
         }
-        spriter.end();
-
 
     }