diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameItems.java b/core/src/ru/deadsoftware/cavedroid/game/GameItems.java
index 079f4855d88465aebea7b60091b06e773d3ac328..370f1b0081367e6d601100cf7b630576f1091fcd 100644 (file)
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.io.FileInputStream;
import java.util.*;
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) {
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(Block::getId));
- TreeSet<Item> itemsSet = new TreeSet<>(Comparator.comparingInt(Item::getId));
+ 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;
boolean animated = Assets.getBooleanFromJson(block, "animated", false);
int frames = Assets.getIntFromJson(block, "frames", 0);
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) {
count++;
}
- Block newBlock = new Block(
+ 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,
- left,
- top,
- right,
- bottom,
+ collMargins,
hp,
- drop,
+ dropInfo,
collision,
background,
transparent,
requiresBlock,
- fluid,
- meta,
+ animInfo,
texture,
- animated,
- frames,
- clipX,
- clipY,
- clipWidth,
- clipHeight
+ spriteMargins
);
+
+ 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 {
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);
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.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