X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fmenu%2Fsubmenus%2FMenu.java;h=dcb06d3d937877a2cf3aa8ea4dd8daf05ad119f9;hp=17367d8f98884ecf513f3a182f6adcd668d5af7a;hb=59d48c1b28c570755327a8fb0827fa57e7fd3914;hpb=c0aa4c7eef4f97c1ef9a8af7eaf2afe2feffd3d0

diff --git a/core/src/ru/deadsoftware/cavedroid/menu/submenus/Menu.java b/core/src/ru/deadsoftware/cavedroid/menu/submenus/Menu.java
index 17367d8..dcb06d3 100644
--- a/core/src/ru/deadsoftware/cavedroid/menu/submenus/Menu.java
+++ b/core/src/ru/deadsoftware/cavedroid/menu/submenus/Menu.java
@@ -9,8 +9,8 @@ import com.badlogic.gdx.utils.JsonValue;
 import ru.deadsoftware.cavedroid.CaveGame;
 import ru.deadsoftware.cavedroid.GameScreen;
 import ru.deadsoftware.cavedroid.menu.objects.Button;
-import ru.deadsoftware.cavedroid.menu.objects.ButtonRenderer;
 import ru.deadsoftware.cavedroid.menu.objects.ButtonEventListener;
+import ru.deadsoftware.cavedroid.menu.objects.ButtonRenderer;
 import ru.deadsoftware.cavedroid.misc.Assets;
 
 import java.util.HashMap;
@@ -28,8 +28,8 @@ public abstract class Menu {
     private ArrayMap<String, Button> buttons;
 
     /**
-     * @param width  Viewport width
-     * @param height Viewport height
+     * @param width          Viewport width
+     * @param height         Viewport height
      * @param buttonRenderer {@link ButtonRenderer} that will draw the buttons of this menu
      */
     Menu(float width, float height, ButtonRenderer buttonRenderer) {
@@ -56,7 +56,9 @@ public abstract class Menu {
      * @param jsonFile A {@link FileHandle} to json file
      */
     void loadButtonsFromJson(FileHandle jsonFile) {
-        if (buttons == null) buttons = new ArrayMap<>();
+        if (buttons == null) {
+            buttons = new ArrayMap<>();
+        }
         HashMap<String, ButtonEventListener> eventListeners = getButtonEventListeners();
         JsonValue json = Assets.jsonReader.parse(jsonFile);
         int y = (int) height / 4;
@@ -64,7 +66,8 @@ public abstract class Menu {
             buttons.put(key.name(),
                     new Button(Assets.getStringFromJson(key, "label", ""),
                             (int) width / 2 - Button.WIDTH / 2,
-                            Assets.getIntFromJson(key, "y", y), Assets.getIntFromJson(key, "type", Button.NORMAL),
+                            Assets.getIntFromJson(key, "y", y),
+                            Assets.getIntFromJson(key, "type", Button.NORMAL),
                             eventListeners.containsKey(key.name()) ? eventListeners.get(key.name()) : () -> {
                             }));
         }