From 2f48cdd04a47f1b79ce70a10fa11becc6e9cc4e3 Mon Sep 17 00:00:00 2001 From: jzitnik-dev Date: Tue, 25 Feb 2025 12:36:37 +0100 Subject: [PATCH] feat: Fixed textures and minor changes --- .../java/cz/jzitnik/game/SpriteLoader.java | 10 ++-- .../game/crafting/CraftingRecipeList.java | 2 +- src/main/java/cz/jzitnik/game/items/Item.java | 3 +- .../jzitnik/game/items/ItemBlockSupplier.java | 8 +-- .../java/cz/jzitnik/game/sprites/Air.java | 2 +- .../java/cz/jzitnik/game/sprites/Bedrock.java | 14 ----- .../java/cz/jzitnik/game/sprites/Dirt.java | 14 ----- .../java/cz/jzitnik/game/sprites/OakLeaf.java | 20 -------- .../java/cz/jzitnik/game/sprites/OakLog.java | 14 ----- .../cz/jzitnik/game/sprites/SimpleSprite.java | 2 +- .../java/cz/jzitnik/game/sprites/Steve.java | 2 +- .../java/cz/jzitnik/game/sprites/Stone.java | 14 ----- .../cz/jzitnik/game/ui/CraftingTable.java | 2 +- .../java/cz/jzitnik/game/ui/Inventory.java | 4 ++ .../cz/jzitnik/tui/utils/SpriteCombiner.java | 2 +- src/main/resources/textures/cobblestone.ans | 51 +++++++++---------- src/main/resources/textures/dirt.ans | 51 +++++++++---------- src/main/resources/textures/grass.ans | 51 +++++++++---------- .../resources/textures/items/cobblestone.ans | 51 +++++++++---------- src/main/resources/textures/items/stick.ans | 51 +++++++++---------- .../resources/textures/items/stone_axe.ans | 50 +++++++++--------- .../textures/items/stone_pickaxe.ans | 51 +++++++++---------- .../textures/items/wooden_pickaxe.ans | 51 +++++++++---------- 23 files changed, 221 insertions(+), 299 deletions(-) delete mode 100644 src/main/java/cz/jzitnik/game/sprites/Bedrock.java delete mode 100644 src/main/java/cz/jzitnik/game/sprites/Dirt.java delete mode 100644 src/main/java/cz/jzitnik/game/sprites/OakLeaf.java delete mode 100644 src/main/java/cz/jzitnik/game/sprites/OakLog.java delete mode 100644 src/main/java/cz/jzitnik/game/sprites/Stone.java diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java index 2e12dfe..5d2efbe 100644 --- a/src/main/java/cz/jzitnik/game/SpriteLoader.java +++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java @@ -41,14 +41,14 @@ public class SpriteLoader { static { SPRITES_MAP.put(SPRITES.AIR, new Air()); - SPRITES_MAP.put(SPRITES.DIRT, new Dirt()); + SPRITES_MAP.put(SPRITES.DIRT, new SimpleSprite("dirt.ans")); SPRITES_MAP.put(SPRITES.GRASS, new Grass()); - SPRITES_MAP.put(SPRITES.STONE, new Stone()); + SPRITES_MAP.put(SPRITES.STONE, new SimpleSprite("stone.ans")); SPRITES_MAP.put(SPRITES.STEVE, new Steve()); - SPRITES_MAP.put(SPRITES.BEDROCK, new Bedrock()); + SPRITES_MAP.put(SPRITES.BEDROCK, new SimpleSprite("bedrock.ans")); SPRITES_MAP.put(SPRITES.BREAKING, new Breaking()); - SPRITES_MAP.put(SPRITES.OAK_LOG, new OakLog()); - SPRITES_MAP.put(SPRITES.OAK_LEAF, new OakLeaf()); + SPRITES_MAP.put(SPRITES.OAK_LOG, new SimpleSprite("oak_log.ans")); + SPRITES_MAP.put(SPRITES.OAK_LEAF, new SimpleSprite("oak_leaf.ans")); SPRITES_MAP.put(SPRITES.OAK_PLANKS, new SimpleSprite("oak_planks.ans")); SPRITES_MAP.put(SPRITES.CRAFTING_TABLE, new SimpleSprite("crafting_table.ans")); SPRITES_MAP.put(SPRITES.COBBLESTONE, new SimpleSprite("cobblestone.ans")); diff --git a/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java b/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java index 7fa3e25..69b2faf 100644 --- a/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java +++ b/src/main/java/cz/jzitnik/game/crafting/CraftingRecipeList.java @@ -6,7 +6,7 @@ import cz.jzitnik.game.items.ItemBlockSupplier; import java.util.*; public class CraftingRecipeList { - private static List recipes = new ArrayList<>(); + private static final List recipes = new ArrayList<>(); static { // Oak planks diff --git a/src/main/java/cz/jzitnik/game/items/Item.java b/src/main/java/cz/jzitnik/game/items/Item.java index 40bd5c0..8cb9834 100644 --- a/src/main/java/cz/jzitnik/game/items/Item.java +++ b/src/main/java/cz/jzitnik/game/items/Item.java @@ -21,7 +21,7 @@ public class Item { private int stackAmount = 64; private Optional block = Optional.empty(); - public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, ToolVariant toolVariant, double miningDecrease, int durability) { + public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, ToolVariant toolVariant, double miningDecrease, int durability, boolean stackable) { this.id = id; this.name = name; this.type = type; @@ -29,6 +29,7 @@ public class Item { this.toolVariant = Optional.of(toolVariant); this.miningDecrease = miningDecrease; this.durability = durability; + this.stackable = stackable; } public Item(String id, String name, ItemType type, SpriteLoader.SPRITES sprite, Block block) { diff --git a/src/main/java/cz/jzitnik/game/items/ItemBlockSupplier.java b/src/main/java/cz/jzitnik/game/items/ItemBlockSupplier.java index c7c2e56..9f40da6 100644 --- a/src/main/java/cz/jzitnik/game/items/ItemBlockSupplier.java +++ b/src/main/java/cz/jzitnik/game/items/ItemBlockSupplier.java @@ -80,19 +80,19 @@ public class ItemBlockSupplier { return Helper.craftingTable(Blocks.craftingTable()); } public static Item woodenPickaxe() { - return new Item("wooden_pickaxe", "Wooden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.WOODEN_PICKAXE, ToolVariant.WOODEN, 12, 59); + return new Item("wooden_pickaxe", "Wooden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.WOODEN_PICKAXE, ToolVariant.WOODEN, 12, 59, false); } public static Item woodenAxe() { - return new Item("wooden_axe", "Wooden axe", ItemType.AXE, SpriteLoader.SPRITES.WOODEN_AXE, ToolVariant.WOODEN, 2, 59); + return new Item("wooden_axe", "Wooden axe", ItemType.AXE, SpriteLoader.SPRITES.WOODEN_AXE, ToolVariant.WOODEN, 2, 59, false); } public static Item cobblestone() { return Helper.cobblestone(Blocks.cobblestone()); } public static Item stonePickaxe() { - return new Item("stone_pickaxe", "Stone pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.STONE_PICKAXE, ToolVariant.STONE, 12.5, 132); + return new Item("stone_pickaxe", "Stone pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.STONE_PICKAXE, ToolVariant.STONE, 12.5, 132, false); } public static Item stoneAxe() { - return new Item("stone_axe", "Stone axe", ItemType.AXE, SpriteLoader.SPRITES.STONE_AXE, ToolVariant.STONE, 3, 132); + return new Item("stone_axe", "Stone axe", ItemType.AXE, SpriteLoader.SPRITES.STONE_AXE, ToolVariant.STONE, 3, 132, false); } } } diff --git a/src/main/java/cz/jzitnik/game/sprites/Air.java b/src/main/java/cz/jzitnik/game/sprites/Air.java index 0d426d7..f6adce2 100644 --- a/src/main/java/cz/jzitnik/game/sprites/Air.java +++ b/src/main/java/cz/jzitnik/game/sprites/Air.java @@ -6,7 +6,7 @@ public class Air extends Sprite { public String getSprite() { StringBuilder sprite = new StringBuilder(); for (int i = 0; i < 25; i++) { - sprite.append("\033[0m ".repeat(50)); + sprite.append("\033[48;2;121;166;255m ".repeat(50)); sprite.append("\n"); } return sprite.toString(); diff --git a/src/main/java/cz/jzitnik/game/sprites/Bedrock.java b/src/main/java/cz/jzitnik/game/sprites/Bedrock.java deleted file mode 100644 index aa1c1b8..0000000 --- a/src/main/java/cz/jzitnik/game/sprites/Bedrock.java +++ /dev/null @@ -1,14 +0,0 @@ -package cz.jzitnik.game.sprites; - -import cz.jzitnik.tui.ResourceLoader; -import cz.jzitnik.tui.Sprite; - -public class Bedrock extends Sprite { - public String getSprite() { - return ResourceLoader.loadResource("bedrock.ans"); - } - - public String getSprite(Enum key) { - throw new RuntimeException("Imposible state"); - } -} diff --git a/src/main/java/cz/jzitnik/game/sprites/Dirt.java b/src/main/java/cz/jzitnik/game/sprites/Dirt.java deleted file mode 100644 index 80f5bea..0000000 --- a/src/main/java/cz/jzitnik/game/sprites/Dirt.java +++ /dev/null @@ -1,14 +0,0 @@ -package cz.jzitnik.game.sprites; - -import cz.jzitnik.tui.ResourceLoader; -import cz.jzitnik.tui.Sprite; - -public class Dirt extends Sprite { - public String getSprite() { - return ResourceLoader.loadResource("dirt.ans"); - } - - public String getSprite(Enum key) { - throw new RuntimeException("Imposible state"); - } -} diff --git a/src/main/java/cz/jzitnik/game/sprites/OakLeaf.java b/src/main/java/cz/jzitnik/game/sprites/OakLeaf.java deleted file mode 100644 index 4a3553d..0000000 --- a/src/main/java/cz/jzitnik/game/sprites/OakLeaf.java +++ /dev/null @@ -1,20 +0,0 @@ -package cz.jzitnik.game.sprites; - -import cz.jzitnik.tui.ResourceLoader; -import cz.jzitnik.tui.Sprite; - -import java.util.Objects; - -public class OakLeaf extends Sprite { - private String fix(String x) { - return x.replaceAll("\033\\[38;5;1;48;5;16m", "\033[0m"); - } - - public String getSprite() { - return fix(Objects.requireNonNull(ResourceLoader.loadResource("oak_leaf.ans"))); - } - - public String getSprite(Enum key) { - throw new RuntimeException("Imposible state"); - } -} diff --git a/src/main/java/cz/jzitnik/game/sprites/OakLog.java b/src/main/java/cz/jzitnik/game/sprites/OakLog.java deleted file mode 100644 index 1292a91..0000000 --- a/src/main/java/cz/jzitnik/game/sprites/OakLog.java +++ /dev/null @@ -1,14 +0,0 @@ -package cz.jzitnik.game.sprites; - -import cz.jzitnik.tui.ResourceLoader; -import cz.jzitnik.tui.Sprite; - -public class OakLog extends Sprite { - public String getSprite() { - return ResourceLoader.loadResource("oak_log.ans"); - } - - public String getSprite(Enum key) { - throw new RuntimeException("Imposible state"); - } -} diff --git a/src/main/java/cz/jzitnik/game/sprites/SimpleSprite.java b/src/main/java/cz/jzitnik/game/sprites/SimpleSprite.java index 8b79d05..25f2e0f 100644 --- a/src/main/java/cz/jzitnik/game/sprites/SimpleSprite.java +++ b/src/main/java/cz/jzitnik/game/sprites/SimpleSprite.java @@ -11,7 +11,7 @@ public class SimpleSprite extends Sprite { } public String getSprite() { - return ResourceLoader.loadResource(resource).replaceAll("\033\\[38;5;1;48;5;16m", "\033[0m"); + return ResourceLoader.loadResource(resource).replaceAll("\033\\[38;5;1;48;5;16m", "\033[49m"); } public String getSprite(Enum key) { diff --git a/src/main/java/cz/jzitnik/game/sprites/Steve.java b/src/main/java/cz/jzitnik/game/sprites/Steve.java index 26bb8b4..4bb3880 100644 --- a/src/main/java/cz/jzitnik/game/sprites/Steve.java +++ b/src/main/java/cz/jzitnik/game/sprites/Steve.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; public class Steve extends Sprite { private String fix(String x) { - var arr = x.replaceAll("\033\\[38;5;1;48;5;16m", "\033[0m").split("\n"); + var arr = x.replaceAll("\033\\[38;5;1;48;5;16m", "\033[49m").split("\n"); arr = Arrays.copyOf(arr, arr.length - 1); // Remove the last line return ("\033[0m ".repeat(50) + "\n").repeat(3) + Arrays.stream(arr).map(y -> "\033[0m ".repeat(12) + y + " " + "\033[0m ".repeat(12) + "\n").collect(Collectors.joining()); } diff --git a/src/main/java/cz/jzitnik/game/sprites/Stone.java b/src/main/java/cz/jzitnik/game/sprites/Stone.java deleted file mode 100644 index 9c7e94a..0000000 --- a/src/main/java/cz/jzitnik/game/sprites/Stone.java +++ /dev/null @@ -1,14 +0,0 @@ -package cz.jzitnik.game.sprites; - -import cz.jzitnik.tui.ResourceLoader; -import cz.jzitnik.tui.Sprite; - -public class Stone extends Sprite { - public String getSprite() { - return ResourceLoader.loadResource("stone.ans"); - } - - public String getSprite(Enum key) { - throw new RuntimeException("Imposible state"); - } -} diff --git a/src/main/java/cz/jzitnik/game/ui/CraftingTable.java b/src/main/java/cz/jzitnik/game/ui/CraftingTable.java index a96076a..b5119a7 100644 --- a/src/main/java/cz/jzitnik/game/ui/CraftingTable.java +++ b/src/main/java/cz/jzitnik/game/ui/CraftingTable.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Optional; public class CraftingTable { - private Game game; + private final Game game; private static final int ROW_AMOUNT = 3; private static final int COLUMN_AMOUNT = 3; private static final int CELL_WIDTH = 50; diff --git a/src/main/java/cz/jzitnik/game/ui/Inventory.java b/src/main/java/cz/jzitnik/game/ui/Inventory.java index 8893ee1..1660156 100644 --- a/src/main/java/cz/jzitnik/game/ui/Inventory.java +++ b/src/main/java/cz/jzitnik/game/ui/Inventory.java @@ -310,6 +310,10 @@ public class Inventory { return; // Nothing to merge } + if (!fromItem.getItem().isStackable() || !toItem.getItem().isStackable()) { + return; + } + if (!fromItem.getItem().equals(toItem.getItem())) { return; // Different items cannot be merged } diff --git a/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java b/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java index de4ab11..da4d6be 100644 --- a/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java +++ b/src/main/java/cz/jzitnik/tui/utils/SpriteCombiner.java @@ -44,7 +44,7 @@ public class SpriteCombiner { if (pixelIndex2 >= row2.length()) break; // Avoid out-of-bounds char pixel2 = row2.charAt(pixelIndex2); - if (color2.equals("\033[0m") && pixel2 == ' ') { + if (color2.equals("\033[0m") && pixel2 == ' ' || color2.equals("\033[49m") && pixel2 == ' ') { combinedRow.append(color1).append(pixel1); } else { combinedRow.append(color2).append(pixel2); diff --git a/src/main/resources/textures/cobblestone.ans b/src/main/resources/textures/cobblestone.ans index 849804b..b86404f 100644 --- a/src/main/resources/textures/cobblestone.ans +++ b/src/main/resources/textures/cobblestone.ans @@ -1,26 +1,25 @@ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ -▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓ - \ No newline at end of file +                         +                         +                          +                          +                          +                         +                         +                         +                         +                          +                          +                         +                         +                          +                         +                          +                        +                        +                        +                        +                          +                         +                     +                         +                        diff --git a/src/main/resources/textures/dirt.ans b/src/main/resources/textures/dirt.ans index 887e98a..fdfb9f3 100644 --- a/src/main/resources/textures/dirt.ans +++ b/src/main/resources/textures/dirt.ans @@ -1,26 +1,25 @@ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▒ -▒▒▒▒▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▒▒▒▒ - \ No newline at end of file +                +                   +                +                 +                 +                   +                   +                    +              +              +               +              +                   +                +                +               +                   +                 +                 +           +                +              +               +                    +                 diff --git a/src/main/resources/textures/grass.ans b/src/main/resources/textures/grass.ans index 7d566f6..a3675c2 100644 --- a/src/main/resources/textures/grass.ans +++ b/src/main/resources/textures/grass.ans @@ -1,26 +1,25 @@ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▒▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒░▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▓▒▒▒▒▒▒░░░▒▒▓▒▒░▒▓▓▒▒▒▒░▒▒▒▒▒▒▒░░▒▒▒▒▒▒▒░▒▒▒▒▒▒ -▒▒▒▒▒▒▓▒▒▒▒▒▒░▒▒▒▒░▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▓▒▒▒▓▓▒▒░▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▓▓▓░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▓▒▒▒▓▓▓▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒░▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▒▒ -▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▒▒░▒░░░▒▒ -▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒░░░▒▒▒░░░▒▒▒▒▒▒▒░░░░░░▓▓▓▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▒▒▓▒▒ -▒▒▒▒▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒ -▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▓▓▓▓▒▒▒▒▒▓▒▒▒▒▒▒▒▒▒ - \ No newline at end of file +                     +                      +                       +                          +                        +                     +                          +                      +                 +                      +                   +               +                        +               +               +                        +                      +                    +                   +                   +                      +                      +                   +                      +                    diff --git a/src/main/resources/textures/items/cobblestone.ans b/src/main/resources/textures/items/cobblestone.ans index e244126..ad51abe 100644 --- a/src/main/resources/textures/items/cobblestone.ans +++ b/src/main/resources/textures/items/cobblestone.ans @@ -1,26 +1,25 @@ -                                                   -                      ▓▓▓▓▓▓▓                      -                  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                  -              ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓              -          ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓          -      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓      -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -   ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   -      ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓      -          ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓          -              ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓              -                  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓                  -                      ▓▓▓▓▓▓▓                      - \ No newline at end of file +                                                  +                                              +                                         +                                   +                                +                             +                          +                          +                           +                         +                           +                            +                        +                          +                          +                       +                            +                         +                         +                            +                                +                                   +                                      +                                              +                                                  diff --git a/src/main/resources/textures/items/stick.ans b/src/main/resources/textures/items/stick.ans index 7817d25..949d762 100644 --- a/src/main/resources/textures/items/stick.ans +++ b/src/main/resources/textures/items/stick.ans @@ -1,26 +1,25 @@ -                                                   -                                                   -                                                   -                                         ░░░░░░    -                                                   -                                         ░░░       -                                         ░░░       -                                      ░░░          -                               ░   ░░░             -                               ░   ░░░             -                            ▓  ░░░░                -                            ░░░░                   -                            ░░░░                   -                         ░░░   ▒                   -                   ▓▓▓░░░    ░░░                   -                      ░░░   ░                      -                   ░░░                             -                   ░░░                             -                ░░░                                -             ░░░                                   -             ░░░                                   -      ░   ░░░                                      -      ░                                            -      ░                                            -                                                   - \ No newline at end of file +                                                   +                                                   +                                                   +                                              +                                              +                                             +                                            +                                            +                                               +                                            +                                            +                                              +                                            +                                              +                                              +                                             +                                             +                                            +                                            +                                              +                                            +                                            +                                               +                                              +                                                   diff --git a/src/main/resources/textures/items/stone_axe.ans b/src/main/resources/textures/items/stone_axe.ans index 98f087d..ea9aca2 100644 --- a/src/main/resources/textures/items/stone_axe.ans +++ b/src/main/resources/textures/items/stone_axe.ans @@ -1,25 +1,25 @@ -  -    -    -         -        -          -            -         -           -           -           -           -          -         -        -       -       -       -      -      -       -       -     -    -  +                                                   +                                              +                                              +                                          +                                           +                                          +                                      +                                     +                                       +                                        +                                     +                                        +                                        +                                        +                                              +                                              +                                              +                                              +                                              +                                               +                                              +                                              +                                              +                                               +                                                   diff --git a/src/main/resources/textures/items/stone_pickaxe.ans b/src/main/resources/textures/items/stone_pickaxe.ans index e9ddfd5..97acbed 100644 --- a/src/main/resources/textures/items/stone_pickaxe.ans +++ b/src/main/resources/textures/items/stone_pickaxe.ans @@ -1,26 +1,25 @@ -                                                   -                                                   -                                                   -                  ▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒               -                ▒▒▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▒▒▒▒▒▒▓▓▓      -               ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓  ░░░░▓      -               ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓   ░░░▓      -                  ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓░░░   ░      -                  ▒▓▓▒▒░░░░░░░░▒   ▓▓▓▓▓▓   ░      -                           ▒▒▒▒▒   ▓▓▓▓▓▓▓▓▓░░░░   -                           ▒▓   ░░░   ▓▓▓▓▓▓▓▓▓░   -                        ▒░ ░░░░▒   ░░░▓▓▓▓▓▓▓▓▓░   -                      ▒▒▒▒  ░░░▒   ░ ░▓▓▓▓▓▓▓▓▓░   -                     ░   ░░░░   ░░░░░░▓▓▓▓▓▓▓▓▓░   -                  ▒▓▓▓░░░░░░░▒▒▒░    ░▓▓▓▓▓▓▓▓▓░   -                ▒▒▒   ░░░   ▓        ░▓▓▓▓▓▓▓▓▓░   -               ▒   ░░░   ▒░░░        ░▓▓▓▓▓▓▓▓▓░   -            ▒▒▒▒   ░░░   ▒░          ░▓▓▓▓▓▓▓▓▓░   -            ▒   ░░░   ░░               ░░▓▓▓░      -        ▒▒   ░░░   ░░░░                 ░░░░░      -      ▒▒▒▒   ░░░   ░                               -      ▒   ░░░   ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░ -      ▒      ░░░░                                  -      ░      ░                                     -                                                   - \ No newline at end of file +                                                   +                                                   +                                                   +                                       +                                        +                                   +                                    +                                  +                                             +                                         +                                        +                                         +                                        +                                         +                                         +                                         +                                         +                                            +                                            +                                               +                                              +                                              +                                               +                                               +                                                   diff --git a/src/main/resources/textures/items/wooden_pickaxe.ans b/src/main/resources/textures/items/wooden_pickaxe.ans index 997f4af..4811284 100644 --- a/src/main/resources/textures/items/wooden_pickaxe.ans +++ b/src/main/resources/textures/items/wooden_pickaxe.ans @@ -1,26 +1,25 @@ -                                                   -                                                   -                                                   -                   ░░░░░░░░░░░░░░░░                -                                                   -                   ░░░░░░░░░░░░░░░░      ░░░       -                   ░░░░░░░░░░░░░░░░      ░░░       -                                ░░░░░░░░░          -                               ░   ░░░░░░          -                               ░   ░░░░░░          -                            ▓   ░░░   ░░░░░░       -                            ░░░░         ░░░       -                            ░░░░         ░░░       -                         ░░░   ▒         ░░░       -                   ▓▓▓░░░   ▒░░░         ░░░       -                      ░░░   ░            ░░░       -                   ░░░                   ░░░       -                   ░░░                   ░░░       -                ░░░                                -             ░░░                                   -             ░░░                                   -      ░   ░░░                                      -      ░                                            -      ░                                            -                                                   - \ No newline at end of file +                                                   +                                                   +                                                   +                                        +                                           +                                    +                                     +                                     +                                             +                                         +                                         +                                         +                                        +                                         +                                         +                                         +                                         +                                            +                                            +                                               +                                              +                                              +                                               +                                               +