X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=82c4b33264acb0942f27968f0e996707328a06d1;hp=da430773336efa771a35be542ad0bae8efcb3883;hb=59d07dd8a43cfb159045e6313cca4d519f67a6fc;hpb=fe4608f2ebca50f37bd9534891187d87018e7bf5

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index da43077..82c4b33 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -4,10 +4,10 @@ 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;
 
@@ -19,87 +19,85 @@ public class GameItems {
     private static ArrayMap<String, Block> blocks = new ArrayMap<>();
     private static 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) && 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;
+        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;
@@ -133,10 +131,9 @@ public class GameItems {
 
             blocksIds.put(key, blocks.size);
             blocks.put(key, newBlock);
-            block = block.next();
         }
-        while (item != null) {
-            String key = item.name;
+        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;
@@ -144,7 +141,6 @@ public class GameItems {
                     new Sprite(new Texture(Gdx.files.internal("textures/items/" + texture + ".png")));
             itemsIds.put(key, items.size);
             items.put(key, new Item(name, type, sprite));
-            item = item.next();
         }
     }