X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameItems.java;h=4024c3614c111a17c64c689ad8fc80b5a500a05e;hb=63ffd8af5e9788f36fc75b6d5c29ae525eb74692;hp=1cebf860ac5f0be1f9a03c2763969d31c0b43c1a;hpb=522264a26a60feed15929afd6fd2cb0a334386b2;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java index 1cebf86..4024c36 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java @@ -3,14 +3,19 @@ package ru.deadsoftware.cavedroid.game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.Sprite; +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 { @@ -30,20 +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"); + return getBlock(id) instanceof Block.Slab; } public static boolean fluidCanFlowThere(int thisId, int thatId) { @@ -88,6 +97,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; } @@ -100,12 +113,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 blocksSet = new TreeSet<>(Comparator.comparingInt(a -> a.getParams().getId())); + TreeSet itemsSet = new TreeSet<>(Comparator.comparingInt(a -> a.getParams().getId())); + - public static void load() { - JsonValue json = Assets.jsonReader.parse(Gdx.files.internal("json/game_items.json")); + int count = 0; for (JsonValue block = json.get("blocks").child(); block != null; block = block.next()) { try { String key = block.name(); @@ -127,38 +142,58 @@ public class GameItems { String meta = Assets.getStringFromJson(block, "meta", ""); String tex = Assets.getStringFromJson(block, "texture", key); Texture texture = tex.equals("none") ? null : - new Texture(Gdx.files.internal("textures/blocks/" + tex + ".png")); + new Texture(assetLoader.getAssetHandle("textures/blocks/" + tex + ".png")); boolean animated = Assets.getBooleanFromJson(block, "animated", false); int frames = Assets.getIntFromJson(block, "frames", 0); - - Block newBlock = new Block( - left, - top, - right, - bottom, + 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); + + 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, + key, + collMargins, hp, - drop, + dropInfo, collision, background, transparent, requiresBlock, - fluid, - meta, + animInfo, texture, - animated, - frames, - clipX, - clipY, - clipWidth, - clipHeight + spriteMargins ); - blocksIds.put(key, blocks.size); - blocks.put(key, newBlock); + Block newBlock = switch (meta) { + case "water" -> new Block.Water(params); + case "lava" -> new Block.Lava(params); + 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(); @@ -166,13 +201,47 @@ public class GameItems { 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, sprite)); + 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 = 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); + 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