Store block references intead of ids

[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 8392efdb786602ca0e874d11ce185895ca74c494..370f1b0081367e6d601100cf7b630576f1091fcd 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
@@ -8,11 +8,13 @@ import com.badlogic.gdx.utils.ArrayMap;
 import com.badlogic.gdx.utils.GdxRuntimeException;
 import com.badlogic.gdx.utils.JsonValue;
 import ru.deadsoftware.cavedroid.game.model.block.*;
-import ru.deadsoftware.cavedroid.game.objects.Item;
+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.io.FileInputStream;
 import java.util.*;
 
 public class GameItems {
@@ -53,12 +55,6 @@ public class GameItems {
         return getBlock(id) instanceof Block.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);
-    }
-
     public static Block getBlock(int id) {
         return blocks.getValueAt(id);
     }
@@ -111,15 +107,11 @@ 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(Item::getId));
+        TreeSet<Item> itemsSet = new TreeSet<>(Comparator.comparingInt(a -> a.getParams().getId()));
 
 
         int count = 0;
@@ -150,6 +142,7 @@ public class GameItems {
                 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);
 
                 if (count >= id) {
@@ -180,8 +173,8 @@ public class GameItems {
                 );
 
                 Block newBlock = switch (meta) {
-                    case "water" -> new Block.Water(params, 5);
-                    case "lava" -> new Block.Lava(params, 5);
+                    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);
                 };
@@ -193,6 +186,8 @@ public class GameItems {
             }
         }
 
+        blocksSet.forEach((block -> blocks.put(block.getParams().getKey(), block)));
+
         count = 0;
         for (JsonValue item = json.get("items").child(); item != null; item = item.next()) {
             try {
@@ -203,6 +198,10 @@ 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);
@@ -213,19 +212,31 @@ public class GameItems {
 
                 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);
-                itemsSet.add(new Item(id, key, name, type, sprite, origin, actionKey));
+                itemsSet.add(newItem);
             } 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)));
+        itemsSet.forEach((item -> items.put(item.getParams().getKey(), item)));
     }
 
 }
\ No newline at end of file