From 6d0a2a068bb97862fb1d205a0d01557156592632 Mon Sep 17 00:00:00 2001 From: jull Date: Sun, 2 Mar 2025 11:38:34 +0100 Subject: [PATCH] chore: ores --- .../java/cz/jzitnik/game/SpriteLoader.java | 8 +++--- .../items/registry/blocks/CoalBlock.java | 16 ++++++++++++ .../items/registry/blocks/CoalOreBlock.java | 16 ++++++++++++ .../items/registry/blocks/GoldBlock.java | 16 ++++++++++++ .../items/registry/blocks/GoldOreBlock.java | 16 ++++++++++++ .../items/registry/blocks/IronBlock.java | 16 ++++++++++++ .../items/registry/items/CoalBlockItem.java | 13 ++++++++++ .../items/registry/items/CoalOreItem.java | 13 ++++++++++ .../items/registry/items/GoldBlockItem.java | 13 ++++++++++ .../items/registry/items/GoldOreItem.java | 13 ++++++++++ .../items/registry/items/IronBlockItem.java | 13 ++++++++++ src/main/resources/textures/coal_block.ans | 25 +++++++++++++++++++ .../resources/textures/items/coal_block.ans | 25 +++++++++++++++++++ 13 files changed, 199 insertions(+), 4 deletions(-) create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalBlockItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalOreItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldBlockItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldOreItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/IronBlockItem.java create mode 100644 src/main/resources/textures/coal_block.ans create mode 100644 src/main/resources/textures/items/coal_block.ans diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java index faf2714..15803f0 100644 --- a/src/main/java/cz/jzitnik/game/SpriteLoader.java +++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java @@ -28,7 +28,7 @@ public class SpriteLoader { COAL_ORE, IRON_ORE, // NEWW GOLD_ORE, //NEWW - // Add Coal Block + COAL_BLOCK, // NEWW IRON_BLOCK, // NEWW GOLD_BLOCK, // NEWW @@ -66,7 +66,7 @@ public class SpriteLoader { ITEM_IRON_ORE, //NEWWW ITEM_GOLD_ORE, // NEWW - // Add Item Coal Block + ITEM_COAL_BLOCK, // NEWW ITEM_IRON_BLOCK, //NEWWW ITEM_GOLD_BLOCK, // NEWW @@ -134,7 +134,7 @@ public class SpriteLoader { SPRITES_MAP.put(SPRITES.IRON_ORE, new SimpleSprite("iron_ore.ans")); //NEWW SPRITES_MAP.put(SPRITES.GOLD_ORE, new SimpleSprite("gold_ore.ans")); //NEWW - // Add Coal block + SPRITES_MAP.put(SPRITES.COAL_BLOCK, new SimpleSprite("coal_block.ans")); //NEWW SPRITES_MAP.put(SPRITES.IRON_BLOCK, new SimpleSprite("iron_block.ans")); //NEWW SPRITES_MAP.put(SPRITES.GOLD_BLOCK, new SimpleSprite("gold_block.ans")); //NEWW @@ -172,7 +172,7 @@ public class SpriteLoader { SPRITES_MAP.put(SPRITES.ITEM_IRON_ORE, new SimpleSprite("items/iron_ore.ans")); //NEWWW SPRITES_MAP.put(SPRITES.ITEM_GOLD_ORE, new SimpleSprite("items/gold_ore.ans")); //NEWWW - // Add Item Coal Block + SPRITES_MAP.put(SPRITES.ITEM_COAL_BLOCK, new SimpleSprite("items/coal_block.ans")); //NEWWW SPRITES_MAP.put(SPRITES.ITEM_IRON_BLOCK, new SimpleSprite("items/iron_block.ans")); //NEWWW SPRITES_MAP.put(SPRITES.ITEM_GOLD_BLOCK, new SimpleSprite("items/gold_block.ans")); //NEWWW diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java new file mode 100644 index 0000000..f97e3c6 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("coal_block") +public class CoalBlock extends Block { + public CoalBlock() { + super("coal_block", SpriteLoader.SPRITES.COAL_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java new file mode 100644 index 0000000..fe80ca7 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/CoalOreBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("coal_ore") +public class CoalOreBlock extends Block { + public CoalOreBlock() { + super("coal_ore", SpriteLoader.SPRITES.COAL_ORE, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java new file mode 100644 index 0000000..56a0972 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("gold_block") +public class GoldBlock extends Block { + public GoldBlock() { + super("gold_block", SpriteLoader.SPRITES.GOLD_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java new file mode 100644 index 0000000..164757a --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/GoldOreBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("gold_ore") +public class GoldOreBlock extends Block { + public GoldOreBlock() { + super("gold_ore", SpriteLoader.SPRITES.GOLD_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java new file mode 100644 index 0000000..09fec9f --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/IronBlock.java @@ -0,0 +1,16 @@ +package cz.jzitnik.game.entities.items.registry.blocks; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.entities.items.ItemType; +import cz.jzitnik.game.entities.items.ToolVariant; + +import java.util.Arrays; + +@BlockRegistry("iron_block") +public class IronBlock extends Block { + public IronBlock() { + super("iron_block", SpriteLoader.SPRITES.IRON_BLOCK, 15, ItemType.PICKAXE, Arrays.stream(ToolVariant.values()).toList()); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalBlockItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalBlockItem.java new file mode 100644 index 0000000..368ab6c --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalBlockItem.java @@ -0,0 +1,13 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; + +@ItemRegistry("coal_block") +public class CoalBlockItem extends Item { + public CoalBlockItem() { + super("coal_block", "Coal block", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_COAL_BLOCK); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalOreItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalOreItem.java new file mode 100644 index 0000000..0b34e9b --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/CoalOreItem.java @@ -0,0 +1,13 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; + +@ItemRegistry("coal_ore") +public class CoalOreItem extends Item { + public CoalOreItem() { + super("coal_ore", "Coal ore", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_COAL_ORE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldBlockItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldBlockItem.java new file mode 100644 index 0000000..59794c0 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldBlockItem.java @@ -0,0 +1,13 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; + +@ItemRegistry("gold_block") +public class GoldBlockItem extends Item { + public GoldBlockItem() { + super("gold_block", "Gold block", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_GOLD_BLOCK); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldOreItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldOreItem.java new file mode 100644 index 0000000..bf8615b --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/GoldOreItem.java @@ -0,0 +1,13 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; + +@ItemRegistry("gold_ore") +public class GoldOreItem extends Item { + public GoldOreItem() { + super("gold_ore", "Gold ore", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_GOLD_ORE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronBlockItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronBlockItem.java new file mode 100644 index 0000000..d52ccb2 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/IronBlockItem.java @@ -0,0 +1,13 @@ +package cz.jzitnik.game.entities.items.registry.items; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.ItemRegistry; +import cz.jzitnik.game.entities.items.Item; +import cz.jzitnik.game.entities.items.ItemType; + +@ItemRegistry("iron_block") +public class IronBlockItem extends Item { + public IronBlockItem() { + super("iron_block", "Iron block", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_IRON_BLOCK); + } +} diff --git a/src/main/resources/textures/coal_block.ans b/src/main/resources/textures/coal_block.ans new file mode 100644 index 0000000..f85a112 --- /dev/null +++ b/src/main/resources/textures/coal_block.ans @@ -0,0 +1,25 @@ +           +           +            +        +        +            +           +           +        +         +         +             +           +           +             +             +           +             +             +            +             +             +            +         +         diff --git a/src/main/resources/textures/items/coal_block.ans b/src/main/resources/textures/items/coal_block.ans new file mode 100644 index 0000000..0aa3ab0 --- /dev/null +++ b/src/main/resources/textures/items/coal_block.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                         +                                     +                                  +                         +                           +                            +                          +                          +                         +                            +                           +                           +                            +                           +                       +                          +                          +                            +                                  +                                      +                                         +                                              +