X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=370f1b0081367e6d601100cf7b630576f1091fcd;hb=c1fdecd8692e21b59a720eca1a3617cb5eb7c07f;hp=5ae4f19a92e70b96ede2cfcecf01c40fac27d8e5;hpb=462f97f8da742fe35f516fec00ca9a581d688e7a;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 5ae4f19..370f1b0 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -7,13 +7,15 @@ 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.objects.Item;
+import ru.deadsoftware.cavedroid.game.model.block.*;
+import ru.deadsoftware.cavedroid.game.model.item.CommonItemParams;
+import ru.deadsoftware.cavedroid.game.model.item.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.io.FileInputStream;
+import java.util.*;
 
 public class GameItems {
 
@@ -33,26 +35,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");
-    }
-
-    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);
+        return getBlock(id) instanceof Block.Slab;
     }
 
     public static Block getBlock(int id) {
@@ -107,12 +107,14 @@ public class GameItems {
         return getBlock(id).getTexture();
     }
 
-    public static Sprite getItemTex(int id) {
-        return items.getValueAt(id).getType().equals("block") ? getBlockTex(id) : getItem(id).getTexture();
-    }
-
     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(a -> a.getParams().getId()));
+
+
+        int count = 0;
         for (JsonValue block = json.get("blocks").child(); block != null; block = block.next()) {
             try {
                 String key = block.name();
@@ -137,36 +139,56 @@ 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);
+                int state = Assets.getIntFromJson(block, "state", 0);
                 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, state);
+                    case "lava" -> new Block.Lava(params, state);
+                    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());
             }
         }
+
+        blocksSet.forEach((block -> blocks.put(block.getParams().getKey(), block)));
+
+        count = 0;
         for (JsonValue item = json.get("items").child(); item != null; item = item.next()) {
             try {
                 String key = item.name();
@@ -176,19 +198,45 @@ public class GameItems {
                 Sprite sprite = type.equals("block") ? null :
                         new Sprite(new Texture(assetLoader.getAssetHandle("textures/items/" + texture + ".png")));
 
+                if (sprite != null) {
+                    sprite.flip(false, true);
+                }
+
                 float originX = Assets.getFloatFromJson(item, "origin_x", 0f);
                 float originY = Assets.getFloatFromJson(item, "origin_y", 1f);
                 originX = MathUtils.clamp(originX, 0f, 1f);
                 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);
+
+                float mobDamage = Assets.getFloatFromJson(item, "mob_damage_multiplier", 1f);
+                float blockDamage = Assets.getFloatFromJson(item, "block_damage_multiplier", 1f);
+
+                if (count >= id) {
+                    count++;
+                }
+
+                CommonItemParams params = new CommonItemParams(id, key, name, origin);
+
+                Item newItem = switch (type) {
+                    case "bucket" -> new Item.Bucket(params, sprite, actionKey);
+                    case "shovel" -> new Item.Shovel(params, sprite, mobDamage, blockDamage);
+                    case "sword" -> new Item.Sword(params, sprite, mobDamage, blockDamage);
+                    case "block" -> new Item.Placeable(params, blocks.get(key));
+                    default -> throw new RuntimeException("Unknown item type: " + type);
+                };
+
                 itemsIds.put(key, id);
-                items.put(key, new Item(id, name, type, sprite, origin));
+                itemsSet.add(newItem);
             } catch (GdxRuntimeException e) {
                 Gdx.app.error(TAG, e.getMessage());
             }
         }
+
+        itemsSet.forEach((item -> items.put(item.getParams().getKey(), item)));
     }
 
 }
\ No newline at end of file