From: fred-boy <fredboy@protonmail.com>
Date: Sat, 28 Sep 2019 16:49:05 +0000 (+0700)
Subject: Inspect code
X-Git-Tag: alpha0.4~36
X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=commitdiff_plain;h=ef32f2e88b9c0daa411d0c304ce62b1235541fb1

Inspect code
---

diff --git a/.gitignore b/.gitignore
index 6d842f2..ac624d2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -101,13 +101,6 @@ nb-configuration.xml
 /local.properties
 .gradle/
 gradle-app.setting
-/build/
-/android/build/
-/core/build/
-/desktop/build/
-/html/build/
-/ios/build/
-/ios-moe/build/
 
 ## OS Specific
 .DS_Store
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index dbde2a4..014587c 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -6,7 +6,8 @@
             android:allowBackup="true"
             android:icon="@drawable/ic_launcher"
             android:label="@string/app_name"
-            android:theme="@style/GdxTheme" tools:ignore="GoogleAppIndexingWarning">
+            android:theme="@style/GdxTheme" tools:ignore="GoogleAppIndexingWarning"
+            android:fullBackupContent="@xml/backup_descriptor">
         <activity
                 android:name="ru.deadsoftware.cavedroid.AndroidLauncher"
                 android:label="@string/app_name"
diff --git a/android/res/xml/backup_descriptor.xml b/android/res/xml/backup_descriptor.xml
new file mode 100644
index 0000000..6fd6103
--- /dev/null
+++ b/android/res/xml/backup_descriptor.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+    <!-- Exclude specific shared preferences that contain GCM registration Id -->
+</full-backup-content>
diff --git a/core/src/ru/deadsoftware/cavedroid/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
index fc82bf2..09604fd 100644
--- a/core/src/ru/deadsoftware/cavedroid/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
@@ -26,7 +26,7 @@ public class GameScreen implements Screen {
     private MenuRenderer menuRenderer;
 
     private InputHandlerGame inputHandlerGame;
-    private InputHandlerMenu inputHandlerMenu;
+    private final InputHandlerMenu inputHandlerMenu;
 
     public GameScreen() {
         Assets.load();
diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameFluidsThread.java b/core/src/ru/deadsoftware/cavedroid/game/GameFluidsThread.java
index 57c7470..1f0302c 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameFluidsThread.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameFluidsThread.java
@@ -7,7 +7,7 @@ import java.util.Arrays;
 import static ru.deadsoftware.cavedroid.GameScreen.GP;
 import static ru.deadsoftware.cavedroid.game.GameItems.*;
 
-public class GameFluidsThread extends Thread {
+class GameFluidsThread extends Thread {
 
     private static final int FLUID_UPDATE_INTERVAL_MS = 100;
     private static final int FLUID_STATES = 5;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 82c4b33..9945b06 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -13,11 +13,11 @@ import java.util.HashMap;
 
 public class GameItems {
 
-    private static HashMap<String, Integer> blocksIds = new HashMap<>();
-    private static HashMap<String, Integer> itemsIds = new HashMap<>();
+    private static final HashMap<String, Integer> blocksIds = new HashMap<>();
+    private static final HashMap<String, Integer> itemsIds = new HashMap<>();
 
-    private static ArrayMap<String, Block> blocks = new ArrayMap<>();
-    private static ArrayMap<String, Item> items = new ArrayMap<>();
+    private static final ArrayMap<String, Block> blocks = new ArrayMap<>();
+    private static final ArrayMap<String, Item> items = new ArrayMap<>();
 
     static boolean isFluid(int id) {
         return getBlock(id).isFluid();
diff --git a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
index 25709bd..7e12e53 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GamePhysics.java
@@ -17,7 +17,7 @@ class GamePhysics {
 
     static final int PL_SPEED = 2;
 
-    private Vector2 gravity  = new Vector2(0, .9f);
+    private final Vector2 gravity  = new Vector2(0, .9f);
 
     private boolean checkJump(Rectangle rect, int dir) {
         int bl;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index 60be6eb..245f0dc 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
@@ -1,6 +1,5 @@
 package ru.deadsoftware.cavedroid.game;
 
-import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Disposable;
 import ru.deadsoftware.cavedroid.CaveGame;
 import ru.deadsoftware.cavedroid.GameScreen;
@@ -32,9 +31,9 @@ public class GameProc implements Serializable, Disposable {
     transient GamePhysics physics;
 
     public ControlMode controlMode;
-    public Player player;
-    public ArrayList<Mob> mobs;
-    ArrayList<Drop> drops;
+    public final Player player;
+    public final ArrayList<Mob> mobs;
+    final ArrayList<Drop> drops;
 
     public void resetRenderer() {
         int scale = CaveGame.TOUCH ? 320 : 480;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
index e921b98..0c44350 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameWorld.java
@@ -9,9 +9,10 @@ import static ru.deadsoftware.cavedroid.GameScreen.GP;
 @SuppressWarnings("WeakerAccess")
 public class GameWorld {
 
-    private int WIDTH, HEIGHT;
-    private int[][] foreMap;
-    private int[][] backMap;
+    private final int WIDTH;
+    private final int HEIGHT;
+    private final int[][] foreMap;
+    private final int[][] backMap;
 
     GameWorld(int width, int height) {
         WIDTH = width;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/WorldGen.java b/core/src/ru/deadsoftware/cavedroid/game/WorldGen.java
index b6ab59e..f820190 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/WorldGen.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/WorldGen.java
@@ -3,7 +3,7 @@ package ru.deadsoftware.cavedroid.game;
 import com.badlogic.gdx.math.RandomXS128;
 import com.badlogic.gdx.utils.TimeUtils;
 
-public class WorldGen {
+class WorldGen {
 
     private static RandomXS128 rand;
     private static long seed;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
index bcab586..32c63cc 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/mobs/Mob.java
@@ -14,11 +14,12 @@ public abstract class Mob implements Serializable {
     public static final int LEFT = 0;
     public static final int RIGHT = 1;
 
-    private float width, height;
+    private final float width;
+    private final float height;
     private int dir;
 
     public boolean flyMode;
-    public Vector2 pos;
+    public final Vector2 pos;
     public Vector2 mov;
 
     private boolean dead;
@@ -36,7 +37,7 @@ public abstract class Mob implements Serializable {
      * @param dir integer representing a direction where 0 is left and 1 is right.
      *            You should use {@link #LEFT} and {@link #RIGHT} constants
      */
-    public Mob(float x, float y, float width, float height, int dir) {
+    protected Mob(float x, float y, float width, float height, int dir) {
         pos = new Vector2(x, y);
         mov = new Vector2(0, 0);
         this.width = width;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java
index 8cda832..c99f505 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Block.java
@@ -5,12 +5,20 @@ import com.badlogic.gdx.math.Rectangle;
 
 public class Block {
 
-    private int x, y, w, h;
-    private int hp;
-    private String drop, meta;
-    private Sprite tex;
-
-    private boolean coll, bg, tp, rb, fluid;
+    private final int x;
+    private final int y;
+    private final int w;
+    private final int h;
+    private final int hp;
+    private final String drop;
+    private final String meta;
+    private final Sprite tex;
+
+    private final boolean coll;
+    private final boolean bg;
+    private final boolean tp;
+    private final boolean rb;
+    private final boolean fluid;
 
     /**
      *
diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java
index 00bc317..cda629d 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Drop.java
@@ -10,9 +10,10 @@ import static ru.deadsoftware.cavedroid.GameScreen.GP;
 
 public class Drop implements Serializable {
 
-    private int id;
+    private final int id;
     public boolean pickedUp = false;
-    public Vector2 move, pos;
+    public final Vector2 move;
+    public final Vector2 pos;
 
     public Drop(float x, float y, int id) {
         this.id = id;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/Item.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Item.java
index a619a1b..0083001 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/objects/Item.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Item.java
@@ -4,8 +4,9 @@ import com.badlogic.gdx.graphics.g2d.Sprite;
 
 public class Item {
 
-    private String name, type;
-    private Sprite tex;
+    private final String name;
+    private final String type;
+    private final Sprite tex;
 
     public Item(String name, String type, Sprite tex) {
         this.name = name;
diff --git a/core/src/ru/deadsoftware/cavedroid/game/objects/Player.java b/core/src/ru/deadsoftware/cavedroid/game/objects/Player.java
index 1c12f03..11863b7 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/objects/Player.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/objects/Player.java
@@ -12,9 +12,9 @@ import static ru.deadsoftware.cavedroid.GameScreen.GP;
 
 public class Player extends Mob implements Serializable {
 
-    public int[] inventory;
+    public final int[] inventory;
     public int slot;
-    public int gameMode;
+    public final int gameMode;
     public boolean swim;
 
     public Player(int gameMode) {
diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java b/core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java
index 74fbf95..fe1834d 100644
--- a/core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/menu/MenuRenderer.java
@@ -19,8 +19,8 @@ import static ru.deadsoftware.cavedroid.misc.Assets.*;
 
 public class MenuRenderer extends Renderer {
 
-    public Array<Button> menuMainBtns;
-    public Array<Button> menuNGBtns;
+    public final Array<Button> menuMainBtns;
+    public final Array<Button> menuNGBtns;
 
     public MenuRenderer(int width) {
         super(width, width * GameScreen.getHeight() / GameScreen.getWidth());
diff --git a/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java b/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
index f0da583..123b9b5 100644
--- a/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
+++ b/core/src/ru/deadsoftware/cavedroid/menu/objects/Button.java
@@ -4,18 +4,18 @@ import com.badlogic.gdx.math.Rectangle;
 
 public class Button {
 
-    private Rectangle rect;
-    private String label;
+    private final Rectangle rect;
+    private final String label;
     private int type;
 
-    public Button(String label, float x, float y, float width, float heigth, int type) {
+    public Button(String label, float x, float y, float width, float height, int type) {
         this.label = label;
-        rect = new Rectangle(x, y, width, heigth);
+        rect = new Rectangle(x, y, width, height);
         this.type = type;
     }
 
-    public Button(String label, float x, float y, float width, float heigth) {
-        this(label, x, y, width, heigth, 1);
+    public Button(String label, float x, float y, float width, float height) {
+        this(label, x, y, width, height, 1);
     }
 
     public Button(String label, float x, float y, int type) {
diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
index 778a44d..e2abcdf 100644
--- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java
@@ -15,18 +15,18 @@ import java.util.HashMap;
 
 public class Assets {
 
-    public static JsonReader jsonReader = new JsonReader();
+    public static final JsonReader jsonReader = new JsonReader();
 
-    private static GlyphLayout glyphLayout = new GlyphLayout();
+    private static final GlyphLayout glyphLayout = new GlyphLayout();
 
     static BitmapFont minecraftFont;
 
-    public static Sprite[][] playerSprite = new Sprite[2][4];
-    public static Sprite[][] pigSprite = new Sprite[2][2];
+    public static final Sprite[][] playerSprite = new Sprite[2][4];
+    public static final Sprite[][] pigSprite = new Sprite[2][2];
     public static Sprite fallingSandSprite;
     public static Sprite fallingGravelSprite;
-    public static HashMap<String, TextureRegion> textureRegions = new HashMap<>();
-    public static ArrayMap<String, Rectangle> guiMap = new ArrayMap<>();
+    public static final HashMap<String, TextureRegion> textureRegions = new HashMap<>();
+    public static final ArrayMap<String, Rectangle> guiMap = new ArrayMap<>();
 
     private static TextureRegion flippedRegion(Texture texture, int x, int y, int width, int height) {
         return new TextureRegion(texture, x, y + height, width, -height);
diff --git a/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java b/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java
index 5616d7b..b97b5fe 100644
--- a/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/InputHandlerMenu.java
@@ -8,7 +8,7 @@ import ru.deadsoftware.cavedroid.menu.objects.Button;
 
 public class InputHandlerMenu implements InputProcessor {
 
-    private MenuRenderer menuRenderer;
+    private final MenuRenderer menuRenderer;
 
     public InputHandlerMenu(MenuRenderer menuRenderer) {
         this.menuRenderer = menuRenderer;
diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
index 18e077a..4919bc8 100644
--- a/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
+++ b/core/src/ru/deadsoftware/cavedroid/misc/Renderer.java
@@ -7,16 +7,16 @@ import ru.deadsoftware.cavedroid.GameScreen;
 
 public abstract class Renderer {
 
-    private OrthographicCamera camera;
+    private final OrthographicCamera camera;
 
-    protected ShapeRenderer shaper;
-    protected SpriteBatch spriter;
+    protected final ShapeRenderer shaper;
+    protected final SpriteBatch spriter;
 
-    public Renderer() {
+    protected Renderer() {
         this(GameScreen.getWidth(), GameScreen.getHeight());
     }
 
-    public Renderer(float width, float height) {
+    protected Renderer(float width, float height) {
         camera = new OrthographicCamera();
         camera.setToOrtho(true, width, height);
         shaper = new ShapeRenderer();
diff --git a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
index b3f09bf..4551dce 100644
--- a/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
+++ b/desktop/src/ru/deadsoftware/cavedroid/desktop/DesktopLauncher.java
@@ -5,7 +5,7 @@ import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 import ru.deadsoftware.cavedroid.CaveGame;
 
-public class DesktopLauncher {
+class DesktopLauncher {
 	public static void main (String[] arg) {
 		LwjglApplicationConfiguration config = new LwjglApplicationConfiguration();
 		config.addIcon("icons/icon256.png", Files.FileType.Internal);