From 115eb3d1e276d862941598ef3280f73e4d14b854 Mon Sep 17 00:00:00 2001 From: fred-boy Date: Sun, 29 Sep 2019 00:27:53 +0700 Subject: [PATCH] Remove ternary reading from json --- .../cavedroid/game/GameItems.java | 53 +++++++------------ .../deadsoftware/cavedroid/misc/Assets.java | 20 +++++-- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java index 9945b06..b6f84ec 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java @@ -98,45 +98,30 @@ public class GameItems { 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; - int bottom = block.has("bottom") ? block.getInt("bottom") : 0; - int hp = block.has("hp") ? block.getInt("hp") : -1; - String drop = block.has("drop") ? block.getString("drop") : key; - boolean collision = !block.has("collision") || block.getBoolean("collision"); - boolean background = block.has("background") && block.getBoolean("background"); - boolean transparent = block.has("transparent") && block.getBoolean("transparent"); - boolean blockRequired = block.has("block_required") && block.getBoolean("block_required"); - boolean fluid = block.has("fluid") && block.getBoolean("fluid"); - String meta = block.has("meta") ? block.getString("meta") : ""; - String texture = block.has("texture") ? block.getString("texture") : key; - Sprite sprite = key.equals("none") ? null : - new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + texture + ".png"))); - Block newBlock = new Block( - left, - top, - right, - bottom, - hp, - drop, - collision, - background, - transparent, - blockRequired, - fluid, - meta, - sprite - ); - + int left = Assets.getIntFromJson(block, "left", 0); + int right = Assets.getIntFromJson(block, "right", 0); + int top = Assets.getIntFromJson(block, "top", 0); + int bottom = Assets.getIntFromJson(block, "bottom", 0); + int hp = Assets.getIntFromJson(block, "hp", -1); + boolean coll = Assets.getBooleanFromJson(block, "collision", true); + boolean bg = Assets.getBooleanFromJson(block, "background", false); + boolean tp = Assets.getBooleanFromJson(block, "transparent", false); + boolean br = Assets.getBooleanFromJson(block, "block_required", false); + boolean fluid = Assets.getBooleanFromJson(block, "fluid", false); + String drop = Assets.getStringFromJson(block, "drop", key); + String meta = Assets.getStringFromJson(block, "meta", ""); + String tex = Assets.getStringFromJson(block, "texture", key); + Sprite sprite = tex.equals("none") ? null : + new Sprite(new Texture(Gdx.files.internal("textures/blocks/" + tex + ".png"))); + Block newBlock = new Block(left, top, right, bottom, hp, drop, coll, bg, tp, br, fluid, meta, sprite); blocksIds.put(key, blocks.size); blocks.put(key, newBlock); } 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; + String name = Assets.getStringFromJson(item, "name", key); + 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); diff --git a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java index e2abcdf..d86d3f8 100644 --- a/core/src/ru/deadsoftware/cavedroid/misc/Assets.java +++ b/core/src/ru/deadsoftware/cavedroid/misc/Assets.java @@ -91,10 +91,10 @@ public class Assets { textureRegions.put(file.name(), flippedRegion(texture, 0, 0, texture.getWidth(), texture.getHeight())); } else { for (JsonValue key = file.child(); key != null; key = key.next()) { - int x = key.has("x") ? key.getInt("x") : 0; - int y = key.has("y") ? key.getInt("y") : 0; - int w = key.has("w") ? key.getInt("w") : texture.getWidth(); - int h = key.has("h") ? key.getInt("h") : texture.getHeight(); + int x = getIntFromJson(key, "x", 0); + int y = getIntFromJson(key, "y", 0); + int w = getIntFromJson(key, "w", texture.getWidth()); + int h = getIntFromJson(key, "h", texture.getHeight()); textureRegions.put(key.name(), flippedRegion(texture, x, y, w, h)); } } @@ -128,4 +128,16 @@ public class Assets { return (int) glyphLayout.height; } + public static int getIntFromJson(JsonValue json, String name, int defaultValue) { + return json.has(name) ? json.getInt(name) : defaultValue; + } + + public static String getStringFromJson(JsonValue json, String name, String defaultValue) { + return json.has(name) ? json.getString(name) : defaultValue; + } + + public static boolean getBooleanFromJson(JsonValue json, String name, boolean defaultValue) { + return json.has(name) ? json.getBoolean(name) : defaultValue; + } + } -- 2.29.2