New blocks structure

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / GameItems.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 56a2b5860eb6df91ef1691207e37e80d631491d7..8392efdb786602ca0e874d11ce185895ca74c494 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -7,13 +7,13 @@ import com.badlogic.gdx.math.MathUtils;
 import com.badlogic.gdx.utils.ArrayMap;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.JsonValue;
-import ru.deadsoftware.cavedroid.game.objects.Block;
+import ru.deadsoftware.cavedroid.game.model.block.*;
 import ru.deadsoftware.cavedroid.game.objects.Item;
 import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
 import ru.deadsoftware.cavedroid.misc.utils.SpriteOrigin;
 
-import java.util.HashMap;
+import java.util.*;
 
 public class GameItems {
 
@@ -33,20 +33,24 @@ public class GameItems {
         return isWater(getBlock(id));
     }
 
+    @Deprecated
     public static boolean isWater(Block block) {
-        return block.getMeta().equals("water");
+        return block instanceof Block.Water;
     }
 
+    @Deprecated
     public static boolean isLava(int id) {
         return isLava(getBlock(id));
     }
 
+    @Deprecated
     public static boolean isLava(Block block) {
-        return block.getMeta().equals("lava");
+        return block instanceof Block.Lava;
     }
 
+    @Deprecated
     public static boolean isSlab(int id) {
-        return getBlock(id).getMeta().equals("slab");
+        return getBlock(id) instanceof Block.Slab;
     }
 
     public static boolean fluidCanFlowThere(int thisId, int thatId) {
@@ -91,6 +95,10 @@ public class GameItems {
         return getBlockId(items.getKeyAt(id));
     }
 
+    public static int getItemIdByBlockId(int id) {
+        return getItemId(blocks.getKeyAt(id));
+    }
+
     public static int getBlocksSize() {
         return blocks.size;
     }
@@ -109,6 +117,12 @@ public class GameItems {
 
     public static void load(AssetLoader assetLoader) {
         JsonValue json = Assets.jsonReader.parse(assetLoader.getAssetHandle("json/game_items.json"));
+
+        TreeSet<Block> blocksSet = new TreeSet<>(Comparator.comparingInt(a -> a.getParams().getId()));
+        TreeSet<Item> itemsSet = new TreeSet<>(Comparator.comparingInt(Item::getId));
+
+
+        int count = 0;
         for (JsonValue block = json.get("blocks").child(); block != null; block = block.next()) {
             try {
                 String key = block.name();
@@ -133,36 +147,53 @@ public class GameItems {
                         new Texture(assetLoader.getAssetHandle("textures/blocks/" + tex + ".png"));
                 boolean animated = Assets.getBooleanFromJson(block, "animated", false);
                 int frames = Assets.getIntFromJson(block, "frames", 0);
-                int id = blocks.size;
+                int id = Assets.getIntFromJson(block, "id", count);
+                int dropCount = Assets.getIntFromJson(block, "drop_count", 1);
+                String fullBlock = Assets.getStringFromJson(block, "full_block", null);
                 blocksIds.put(key, id);
 
-                Block newBlock = new Block(
+                if (count >= id) {
+                    count++;
+                }
+
+                BlockMargins collMargins = new BlockMargins(left, top, right, bottom);
+                BlockMargins spriteMargins = new BlockMargins(clipX, clipY, clipWidth, clipHeight);
+                BlockDropInfo dropInfo = new BlockDropInfo(drop, dropCount);
+                BlockAnimationInfo animInfo = null;
+                if (animated) {
+                    animInfo = new BlockAnimationInfo(frames);
+                }
+
+                CommonBlockParams params = new CommonBlockParams(
                         id,
-                        left,
-                        top,
-                        right,
-                        bottom,
+                        key,
+                        collMargins,
                         hp,
-                        drop,
+                        dropInfo,
                         collision,
                         background,
                         transparent,
                         requiresBlock,
-                        fluid,
-                        meta,
+                        animInfo,
                         texture,
-                        animated,
-                        frames,
-                        clipX,
-                        clipY,
-                        clipWidth,
-                        clipHeight
+                        spriteMargins
                 );
-                blocks.put(key, newBlock);
+
+                Block newBlock = switch (meta) {
+                    case "water" -> new Block.Water(params, 5);
+                    case "lava" -> new Block.Lava(params, 5);
+                    case "slab" -> new Block.Slab(params, fullBlock);
+                    default -> new Block.Normal(params);
+                };
+
+                newBlock.initialize();
+                blocksSet.add(newBlock);
             } catch (GdxRuntimeException e) {
                 Gdx.app.error(TAG, e.getMessage());
             }
         }
+
+        count = 0;
         for (JsonValue item = json.get("items").child(); item != null; item = item.next()) {
             try {
                 String key = item.name();
@@ -178,13 +209,23 @@ public class GameItems {
                 originY = MathUtils.clamp(originY, 0f, 1f);
                 SpriteOrigin origin = new SpriteOrigin(originX, originY);
 
-                int id = items.size;
+                int id = Assets.getIntFromJson(item, "id", count);
+
+                String actionKey = Assets.getStringFromJson(item, "action_key", null);
+
+                if (count >= id) {
+                    count++;
+                }
+
                 itemsIds.put(key, id);
-                items.put(key, new Item(id, name, type, sprite, origin));
+                itemsSet.add(new Item(id, key, name, type, sprite, origin, actionKey));
             } catch (GdxRuntimeException e) {
                 Gdx.app.error(TAG, e.getMessage());
             }
         }
+
+        blocksSet.forEach((block -> blocks.put(block.getParams().getKey(), block)));
+        itemsSet.forEach((item -> items.put(item.getKey(), item)));
     }
 
 }
\ No newline at end of file