X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=b6f84ecd42be2c7f20ee76e654e6088c67e14cdb;hb=115eb3d1e276d862941598ef3280f73e4d14b854;hp=c3e020791570a456bf906f41165d8a76cb654171;hpb=793c88f81ae273b531dcdea267e1720c6878cc95;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index c3e0207..b6f84ec 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -4,131 +4,128 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.utils.ArrayMap;
-import com.badlogic.gdx.utils.JsonReader;
 import com.badlogic.gdx.utils.JsonValue;
 import ru.deadsoftware.cavedroid.game.objects.Block;
 import ru.deadsoftware.cavedroid.game.objects.Item;
+import ru.deadsoftware.cavedroid.misc.Assets;
 
 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<>();
 
-    public static boolean isFluid(int id) {
+    static boolean isFluid(int id) {
         return getBlock(id).isFluid();
     }
 
-    public static boolean isWater(int id) {
+    static boolean isWater(int id) {
         return getBlock(id).getMeta().equals("water");
     }
 
-    public static boolean isLava(int id) {
+    static boolean isLava(int id) {
         return getBlock(id).getMeta().equals("lava");
     }
 
-    public static boolean isSlab(int id) {
+    static boolean isSlab(int id) {
         return getBlock(id).getMeta().equals("slab");
     }
 
-    public static boolean fluidCanFlowThere(int thisId, int thatId) {
+    static boolean fluidCanFlowThere(int thisId, int thatId) {
         return thatId == 0 || (!getBlock(thatId).hasCollision() && !isFluid(thatId)) ||
-                (isWater(thisId) && isWater(thatId) && thatId >= thisId) ||
-                (isLava(thisId) && isLava(thatId) && thatId >= thisId);
+                (isWater(thisId) && isWater(thatId) && thisId < thatId) ||
+                (isLava(thisId) && isLava(thatId) && thisId < thatId);
     }
 
-    public static Block getBlock(int id) {
+    static Block getBlock(int id) {
         return blocks.getValueAt(id);
     }
 
-    public static Item getItem(int id) {
+    static Item getItem(int id) {
         return items.getValueAt(id);
     }
 
-    public static Block getBlock(String key) {
+    static Block getBlock(String key) {
         return blocks.getValueAt(blocksIds.get(key));
     }
 
-    public static Item getItem(String key) {
+    static Item getItem(String key) {
         return items.getValueAt(itemsIds.get(key));
     }
 
-    public static int getBlockId(String key) {
+    static int getBlockId(String key) {
         return blocksIds.get(key);
     }
 
-    public static int getItemId(String key) {
+    static int getItemId(String key) {
         return itemsIds.get(key);
     }
 
-    public static String getBlockKey(int id) {
+    static String getBlockKey(int id) {
         return blocks.getKeyAt(id);
     }
 
-    public static String getItemKey(int id) {
+    static String getItemKey(int id) {
         return items.getKeyAt(id);
     }
 
-    public static int getBlockIdByItemId(int id) {
+    static int getBlockIdByItemId(int id) {
         return getBlockId(items.getKeyAt(id));
     }
 
-    public static int getBlocksSize() {
+    static int getBlocksSize() {
         return blocks.size;
     }
 
-    public static int getItemsSize() {
+    static int getItemsSize() {
         return items.size;
     }
 
-    public static Sprite getBlockTex(int id) {
+    static Sprite getBlockTex(int id) {
         return getBlock(id).getTex();
     }
 
-    public static Sprite getItemTex(int id) {
+    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 = new JsonReader().parse(Gdx.files.internal("game_items.json"));
-        JsonValue block = json.child.child;
-        JsonValue item = json.child.next.child;
-        while (block != null) {
-            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("collision") || block.getBoolean("collision"));
-            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);
+        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 = 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, new Block(left, top, right, bottom, hp, drop, collision,
-                    background, transparent, blockRequired, fluid, meta,
-                    key.equals("none") ? null :
-                            new Sprite(new Texture(Gdx.files.internal("textures/" + texture + ".png")))));
-            block = block.next();
+            blocks.put(key, newBlock);
         }
-        while (item != null) {
-            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);
+        for (JsonValue item = json.get("items").child(); item != null; item = item.next()) {
+            String key = item.name();
+            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);
-            items.put(key, new Item(name, type, type.equals("block") ? null :
-                    new Sprite(new Texture(Gdx.files.internal("textures/" + texture + ".png")))));
-            item = item.next();
+            items.put(key, new Item(name, type, sprite));
         }
     }