X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=8c3720d42927dffb5da03e7c95c677447f031f61;hb=9512f90f754ac74780592783b1e241eeca21a249;hp=9945b06d068e80cd3b78170c187e4c659f06fbb2;hpb=ef32f2e88b9c0daa411d0c304ce62b1235541fb1;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 9945b06..8c3720d 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -19,124 +19,112 @@ public class GameItems {
     private static final ArrayMap<String, Block> blocks = new ArrayMap<>();
     private static final ArrayMap<String, Item> items = new ArrayMap<>();
 
-    static boolean isFluid(int id) {
+    public static boolean isFluid(int id) {
         return getBlock(id).isFluid();
     }
 
-    static boolean isWater(int id) {
+    public static boolean isWater(int id) {
         return getBlock(id).getMeta().equals("water");
     }
 
-    static boolean isLava(int id) {
+    public static boolean isLava(int id) {
         return getBlock(id).getMeta().equals("lava");
     }
 
-    static boolean isSlab(int id) {
+    public static boolean isSlab(int id) {
         return getBlock(id).getMeta().equals("slab");
     }
 
-    static boolean fluidCanFlowThere(int thisId, int thatId) {
+    public static boolean fluidCanFlowThere(int thisId, int thatId) {
         return thatId == 0 || (!getBlock(thatId).hasCollision() && !isFluid(thatId)) ||
                 (isWater(thisId) && isWater(thatId) && thisId < thatId) ||
                 (isLava(thisId) && isLava(thatId) && thisId < thatId);
     }
 
-    static Block getBlock(int id) {
+    public static Block getBlock(int id) {
         return blocks.getValueAt(id);
     }
 
-    static Item getItem(int id) {
+    public static Item getItem(int id) {
         return items.getValueAt(id);
     }
 
-    static Block getBlock(String key) {
+    public static Block getBlock(String key) {
         return blocks.getValueAt(blocksIds.get(key));
     }
 
-    static Item getItem(String key) {
+    public static Item getItem(String key) {
         return items.getValueAt(itemsIds.get(key));
     }
 
-    static int getBlockId(String key) {
+    public static int getBlockId(String key) {
         return blocksIds.get(key);
     }
 
-    static int getItemId(String key) {
+    public static int getItemId(String key) {
         return itemsIds.get(key);
     }
 
-    static String getBlockKey(int id) {
+    public static String getBlockKey(int id) {
         return blocks.getKeyAt(id);
     }
 
-    static String getItemKey(int id) {
+    public static String getItemKey(int id) {
         return items.getKeyAt(id);
     }
 
-    static int getBlockIdByItemId(int id) {
+    public static int getBlockIdByItemId(int id) {
         return getBlockId(items.getKeyAt(id));
     }
 
-    static int getBlocksSize() {
+    public static int getBlocksSize() {
         return blocks.size;
     }
 
-    static int getItemsSize() {
+    public static int getItemsSize() {
         return items.size;
     }
 
-    static Sprite getBlockTex(int id) {
+    public static Sprite getBlockTex(int id) {
         return getBlock(id).getTex();
     }
 
-    static Sprite getItemTex(int id) {
-        if (items.getValueAt(id).getType().equals("block")) return getBlockTex(id);
-        else return getItem(id).getTex();
+    public static Sprite getItemTex(int id) {
+        if (items.getValueAt(id).getType().equals("block")) {
+            return getBlockTex(id);
+        } else {
+            return getItem(id).getTex();
+        }
     }
 
     public static void load() {
         JsonValue json = Assets.jsonReader.parse(Gdx.files.internal("json/game_items.json"));
         for (JsonValue block = json.get("blocks").child(); block != null; block = block.next()) {
             String key = block.name();
-            int left = block.has("left") ? block.getInt("left") : 0;
-            int right = block.has("right") ? block.getInt("right") : 0;
-            int top = block.has("top") ? block.getInt("top") : 0;
-            int bottom = block.has("bottom") ? block.getInt("bottom") : 0;
-            int hp = block.has("hp") ? block.getInt("hp") : -1;
-            String drop = block.has("drop") ? block.getString("drop") : key;
-            boolean collision = !block.has("collision") || block.getBoolean("collision");
-            boolean background = block.has("background") && block.getBoolean("background");
-            boolean transparent = block.has("transparent") && block.getBoolean("transparent");
-            boolean blockRequired = block.has("block_required") && block.getBoolean("block_required");
-            boolean fluid = block.has("fluid") && block.getBoolean("fluid");
-            String meta = block.has("meta") ? block.getString("meta") : "";
-            String texture = block.has("texture") ? block.getString("texture") : key;
-            Sprite sprite = key.equals("none") ? null :
-                    new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + texture + ".png")));
-            Block newBlock = new Block(
-                    left,
-                    top,
-                    right,
-                    bottom,
-                    hp,
-                    drop,
-                    collision,
-                    background,
-                    transparent,
-                    blockRequired,
-                    fluid,
-                    meta,
-                    sprite
-            );
-
+            int left = Assets.getIntFromJson(block, "left", 0);
+            int right = Assets.getIntFromJson(block, "right", 0);
+            int top = Assets.getIntFromJson(block, "top", 0);
+            int bottom = Assets.getIntFromJson(block, "bottom", 0);
+            int hp = Assets.getIntFromJson(block, "hp", -1);
+            boolean coll = Assets.getBooleanFromJson(block, "collision", true);
+            boolean bg = Assets.getBooleanFromJson(block, "background", false);
+            boolean tp = Assets.getBooleanFromJson(block, "transparent", false);
+            boolean br = Assets.getBooleanFromJson(block, "block_required", false);
+            boolean fluid = Assets.getBooleanFromJson(block, "fluid", false);
+            String drop = Assets.getStringFromJson(block, "drop", key);
+            String meta = Assets.getStringFromJson(block, "meta", "");
+            String tex = Assets.getStringFromJson(block, "texture", key);
+            Sprite sprite = tex.equals("none") ? null :
+                    new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + tex + ".png")));
+            Block newBlock = new Block(left, top, right, bottom, hp, drop, coll, bg, tp, br, fluid, meta, sprite);
             blocksIds.put(key, blocks.size);
             blocks.put(key, newBlock);
         }
         for (JsonValue item = json.get("items").child(); item != null; item = item.next()) {
             String key = item.name();
-            String name = item.has("name") ? item.getString("name") : key;
-            String type = item.has("type") ? item.getString("type") : "item";
-            String texture = item.has("texture") ? item.getString("texture") : key;
+            String name = Assets.getStringFromJson(item, "name", key);
+            String type = Assets.getStringFromJson(item, "type", "item");
+            String texture = Assets.getStringFromJson(item, "texture", key);
             Sprite sprite = type.equals("block") ? null :
                     new Sprite(new Texture(Gdx.files.internal("textures/items/" + texture + ".png")));
             itemsIds.put(key, items.size);