summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d5e611f)
raw | patch | inline | side by side (parent: d5e611f)
author | fred-boy <fred-boy@protonmail.com> | |
Sun, 9 Sep 2018 12:33:31 +0000 (19:33 +0700) | ||
committer | fred-boy <fred-boy@protonmail.com> | |
Sun, 9 Sep 2018 12:33:31 +0000 (19:33 +0700) |
android/assets/terrain.png | patch | blob | history | |
core/src/ru/deadsoftware/cavecraft/game/Items.java | patch | blob | history | |
core/src/ru/deadsoftware/cavecraft/misc/Assets.java | patch | blob | history |
index 28bfb43f168fd1dd8a6593b75a2ec532f4615db1..73cb45ab0f7f2f5a215e3f8d071e3a409e8ceef0 100644 (file)
Binary files a/android/assets/terrain.png and b/android/assets/terrain.png differ
Binary files a/android/assets/terrain.png and b/android/assets/terrain.png differ
diff --git a/core/src/ru/deadsoftware/cavecraft/game/Items.java b/core/src/ru/deadsoftware/cavecraft/game/Items.java
index 6d49b5d16f655d1bf8c37ca574fb3c6628715077..ca0c949d5acd2ac1bd33f0faf192403c4427a1dc 100644 (file)
BLOCKS.put("wool_green", new Block(45,true,false,false));
BLOCKS.put("wool_red", new Block(46,true,false,false));
BLOCKS.put("wool_black", new Block(47,true,false,false));
+ BLOCKS.put("gold_block", new Block(48));
+ BLOCKS.put("iron_block", new Block(49));
+ BLOCKS.put("stone_slab", new Block(0, 8, 16,8, 50, true, false, true));
+ BLOCKS.put("double_stone_slab", new Block(51));
+ BLOCKS.put("sandstone_slab", new Block(0, 8, 16,8, 52, true, false, true));
+ BLOCKS.put("wooden_slab", new Block(0, 8, 16,8, 53, true, false, true));
+ BLOCKS.put("cobblestone_slab", new Block(0, 8, 16,8, 54, true, false, true));
+ BLOCKS.put("brick_slab", new Block(0, 8, 16,8, 55, true, false, true));
+ BLOCKS.put("stonebrick", new Block(56));
+ BLOCKS.put("stone_brick_slab", new Block(0, 8, 16,8, 57, true, false, true));
+ BLOCKS.put("cactus", new Block(1, 0, 14, 16, 58, true, false, true));
}
public static void load() {
diff --git a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java b/core/src/ru/deadsoftware/cavecraft/misc/Assets.java
index 87e04af1f6eb5c6ed8521b21b1fca78fc86982e0..23d3ea30c2eea01cd928a0bd08177e66cc3add48 100644 (file)
public class Assets {
- public static final int BLOCK_TEXTURES = 48;
+ public static final int BLOCK_TEXTURES = 59;
private static GlyphLayout layout;