Rename Items -> GameItems

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / menu / MenuRenderer.java

diff --git a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
index d7da1c5bc0e1eadf7ea6b432465e56409c6f56e4..aab04d9b76dde0f683c87a89e202859a523c92ba 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
+++ b/core/src/ru/deadsoftware/cavecraft/menu/MenuRenderer.java
@@ -4,8 +4,8 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Array;
 import ru.deadsoftware.cavecraft.CaveGame;
 import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavecraft.game.GameItems;
 import ru.deadsoftware.cavecraft.game.GameSaver;
-import ru.deadsoftware.cavecraft.game.Items;
 import ru.deadsoftware.cavecraft.menu.objects.Button;
 import ru.deadsoftware.cavecraft.misc.AppState;
 import ru.deadsoftware.cavecraft.misc.Assets;
@@ -13,14 +13,14 @@ import ru.deadsoftware.cavecraft.misc.Renderer;
 
 public class MenuRenderer extends Renderer {
 
-    public Array<Button> menuMainButtons;
+    public Array<Button> menuMainBtns;
 
     public MenuRenderer(int width) {
         super(width, width * ((float) GameScreen.getHeight() / GameScreen.getWidth()));
-        menuMainButtons = new Array<Button>();
-        menuMainButtons.add(new Button("New game", getWidth() / 2 - 100, getHeight() / 4));
-        menuMainButtons.add(new Button("Load game", getWidth() / 2 - 100, getHeight() / 4 + 30, GameSaver.exists() ? 1 : 0));
-        menuMainButtons.add(new Button("Quit", getWidth() / 2 - 100, getHeight() / 4 + 60));
+        menuMainBtns = new Array<Button>();
+        menuMainBtns.add(new Button("New game", getWidth() / 2 - 100, getHeight() / 4));
+        menuMainBtns.add(new Button("Load game", getWidth() / 2 - 100, getHeight() / 4 + 30, GameSaver.exists() ? 1 : 0));
+        menuMainBtns.add(new Button("Quit", getWidth() / 2 - 100, getHeight() / 4 + 60));
     }
 
     public void buttonClicked(Button button) {
@@ -34,7 +34,7 @@ public class MenuRenderer extends Renderer {
     }
 
     private void drawButton(Button button) {
-        spriteBatch.draw(Assets.menuButton[button.getType()], button.getX(), button.getY());
+        spriter.draw(Assets.menuBtn[button.getType()], button.getX(), button.getY());
         setFontColor(255, 255, 255);
         drawString(button.getLabel(),
                 (button.getX() + button.getWidth() / 2) - Assets.getStringWidth(button.getLabel()) / 2,
@@ -42,7 +42,7 @@ public class MenuRenderer extends Renderer {
     }
 
     private void drawMenuMain() {
-        for (Button button : menuMainButtons) {
+        for (Button button : menuMainBtns) {
             if (button.getType() > 0) {
                 if (button.getRect().contains(Gdx.input.getX() * getWidth() / GameScreen.getWidth(),
                         Gdx.input.getY() * getHeight() / GameScreen.getHeight()))
@@ -59,13 +59,13 @@ public class MenuRenderer extends Renderer {
 
     @Override
     public void render() {
-        spriteBatch.begin();
+        spriter.begin();
         for (int x = 0; x <= getWidth() / 16; x++)
             for (int y = 0; y <= getHeight() / 16; y++) {
-                spriteBatch.draw(Assets.blockTextures[Items.BLOCKS.get("dirt").getTexture()], x * 16, y * 16);
-                spriteBatch.draw(Assets.shade, x * 16, y * 16);
+                spriter.draw(Assets.blockTex[GameItems.getBlock(3).getTex()], x * 16, y * 16);
+                spriter.draw(Assets.shade, x * 16, y * 16);
             }
-        spriteBatch.draw(Assets.gameLogo, getWidth() / 2 - Assets.gameLogo.getWidth() / 2, 0);
+        spriter.draw(Assets.gameLogo, getWidth() / 2 - Assets.gameLogo.getWidth() / 2, 0);
 
         switch (CaveGame.STATE) {
             case MENU_MAIN:
@@ -82,7 +82,7 @@ public class MenuRenderer extends Renderer {
 
         drawString("CaveCraft " + CaveGame.VERSION, 0,
                 getHeight() - Assets.getStringHeight("CaveCraft " + CaveGame.VERSION) * 1.5f);
-        spriteBatch.end();
+        spriter.end();
 
         switch (CaveGame.STATE) {
             case GOTO_NEW_GAME: