feat: Added beef and leather
This commit is contained in:
@ -53,6 +53,7 @@ public class SpriteLoader {
|
||||
|
||||
// Items
|
||||
ITEM_STICK,
|
||||
ITEM_LEATHER,
|
||||
|
||||
// Block Items
|
||||
ITEM_DIRT,
|
||||
@ -112,6 +113,8 @@ public class SpriteLoader {
|
||||
ITEM_COOKED_PORKCHOP,
|
||||
ITEM_MUTTON,
|
||||
ITEM_COOKED_MUTTON,
|
||||
ITEM_BEEF,
|
||||
ITEM_STEAK,
|
||||
}
|
||||
|
||||
public static final HashMap<SPRITES, Sprite> SPRITES_MAP = new HashMap<>();
|
||||
@ -162,6 +165,7 @@ public class SpriteLoader {
|
||||
|
||||
// Items
|
||||
SPRITES_MAP.put(SPRITES.ITEM_STICK, new SimpleSprite("items/stick.ans"));
|
||||
SPRITES_MAP.put(SPRITES.ITEM_LEATHER, new SimpleSprite("items/leather.ans"));
|
||||
|
||||
// Block Items
|
||||
SPRITES_MAP.put(SPRITES.ITEM_DIRT, new SimpleSprite("items/dirt.ans"));
|
||||
@ -221,6 +225,8 @@ public class SpriteLoader {
|
||||
SPRITES_MAP.put(SPRITES.ITEM_COOKED_PORKCHOP, new SimpleSprite("items/cooked_porkchop.ans"));
|
||||
SPRITES_MAP.put(SPRITES.ITEM_MUTTON, new SimpleSprite("items/mutton.ans"));
|
||||
SPRITES_MAP.put(SPRITES.ITEM_COOKED_MUTTON, new SimpleSprite("items/cooked_mutton.ans"));
|
||||
SPRITES_MAP.put(SPRITES.ITEM_BEEF, new SimpleSprite("items/beef.ans"));
|
||||
SPRITES_MAP.put(SPRITES.ITEM_STEAK, new SimpleSprite("items/steak.ans"));
|
||||
}
|
||||
|
||||
public static SpriteList<SPRITES> load() {
|
||||
|
@ -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("beef")
|
||||
public class BeefItem extends Item {
|
||||
public BeefItem() {
|
||||
super("beef", "Beef", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_BEEF, 2);
|
||||
}
|
||||
}
|
@ -6,8 +6,8 @@ import cz.jzitnik.game.entities.items.Item;
|
||||
import cz.jzitnik.game.entities.items.ItemType;
|
||||
|
||||
@ItemRegistry("cooked_porkchop")
|
||||
public class CookedPorkchop extends Item {
|
||||
public CookedPorkchop() {
|
||||
public class CookedPorkchopItem extends Item {
|
||||
public CookedPorkchopItem() {
|
||||
super("cooked_porkchop", "Cooked porkchop", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_COOKED_PORKCHOP, 4);
|
||||
}
|
||||
}
|
@ -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("leather")
|
||||
public class LeatherItem extends Item {
|
||||
public LeatherItem() {
|
||||
super("leather", "Leather", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.ITEM_LEATHER);
|
||||
}
|
||||
}
|
@ -6,8 +6,8 @@ import cz.jzitnik.game.entities.items.Item;
|
||||
import cz.jzitnik.game.entities.items.ItemType;
|
||||
|
||||
@ItemRegistry("mutton")
|
||||
public class Mutton extends Item {
|
||||
public Mutton() {
|
||||
public class MuttonItem extends Item {
|
||||
public MuttonItem() {
|
||||
super("mutton", "Mutton", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_MUTTON, 2);
|
||||
}
|
||||
}
|
@ -6,8 +6,8 @@ import cz.jzitnik.game.entities.items.Item;
|
||||
import cz.jzitnik.game.entities.items.ItemType;
|
||||
|
||||
@ItemRegistry("porkchop")
|
||||
public class Porkchop extends Item {
|
||||
public Porkchop() {
|
||||
public class PorkchopItem extends Item {
|
||||
public PorkchopItem() {
|
||||
super("porkchop", "Porkchop", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_PORKCHOP, 3);
|
||||
}
|
||||
}
|
@ -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("steak")
|
||||
public class SteakItem extends Item {
|
||||
public SteakItem() {
|
||||
super("steak", "Steak", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_BEEF, 4);
|
||||
}
|
||||
}
|
@ -6,8 +6,8 @@ import cz.jzitnik.game.entities.items.Item;
|
||||
import cz.jzitnik.game.entities.items.ItemType;
|
||||
|
||||
@ItemRegistry("stick")
|
||||
public class Stick extends Item {
|
||||
public Stick() {
|
||||
public class StickItem extends Item {
|
||||
public StickItem() {
|
||||
super("stick", "Stick", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.ITEM_STICK);
|
||||
}
|
||||
}
|
@ -7,8 +7,8 @@ import cz.jzitnik.game.entities.items.ItemType;
|
||||
import cz.jzitnik.game.entities.items.ToolVariant;
|
||||
|
||||
@ItemRegistry("stone_axe")
|
||||
public class StoneAxe extends Item {
|
||||
public StoneAxe() {
|
||||
public class StoneAxeItem extends Item {
|
||||
public StoneAxeItem() {
|
||||
super("stone_axe", "Stone axe", ItemType.AXE, SpriteLoader.SPRITES.STONE_AXE, ToolVariant.STONE, 3, 132, false);
|
||||
}
|
||||
}
|
@ -6,8 +6,8 @@ import cz.jzitnik.game.entities.items.Item;
|
||||
import cz.jzitnik.game.entities.items.ItemType;
|
||||
|
||||
@ItemRegistry("stone")
|
||||
public class StoneItem extends Item {
|
||||
public StoneItem() {
|
||||
public class StoneItemItem extends Item {
|
||||
public StoneItemItem() {
|
||||
super("stone", "Stone", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_STONE);
|
||||
}
|
||||
}
|
@ -7,8 +7,8 @@ import cz.jzitnik.game.entities.items.ItemType;
|
||||
import cz.jzitnik.game.entities.items.ToolVariant;
|
||||
|
||||
@ItemRegistry("stone_pickaxe")
|
||||
public class StonePickaxe extends Item {
|
||||
public StonePickaxe() {
|
||||
public class StonePickaxeItem extends Item {
|
||||
public StonePickaxeItem() {
|
||||
super("stone_pickaxe", "Stone pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.STONE_PICKAXE, ToolVariant.STONE, 12.5, 132, false);
|
||||
}
|
||||
}
|
@ -7,8 +7,8 @@ import cz.jzitnik.game.entities.items.ItemType;
|
||||
import cz.jzitnik.game.entities.items.ToolVariant;
|
||||
|
||||
@ItemRegistry("stone_shovel")
|
||||
public class StoneShovel extends Item {
|
||||
public StoneShovel() {
|
||||
public class StoneShovelItem extends Item {
|
||||
public StoneShovelItem() {
|
||||
super("stone_shovel", "Stone shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.STONE_SHOVEL, ToolVariant.STONE, 0.5, 132, false);
|
||||
}
|
||||
}
|
@ -7,8 +7,8 @@ import cz.jzitnik.game.entities.items.ItemType;
|
||||
import cz.jzitnik.game.entities.items.ToolVariant;
|
||||
|
||||
@ItemRegistry("wooden_axe")
|
||||
public class WoodenAxe extends Item {
|
||||
public WoodenAxe() {
|
||||
super("wooden_axe", "Wooden axe", ItemType.AXE, SpriteLoader.SPRITES.WOODEN_AXE, ToolVariant.WOODEN, 2, 59, false);
|
||||
public class WoodenAxeItem extends Item {
|
||||
public WoodenAxeItem() {
|
||||
super("wooden_axe", "Wooden axe", ItemType.AXE, SpriteLoader.SPRITES.WOODEN_AXE, ToolVariant.WOODEN, 0.5, 59, false);
|
||||
}
|
||||
}
|
@ -7,8 +7,8 @@ import cz.jzitnik.game.entities.items.ItemType;
|
||||
import cz.jzitnik.game.entities.items.ToolVariant;
|
||||
|
||||
@ItemRegistry("wooden_pickaxe")
|
||||
public class WoodenPickaxe extends Item {
|
||||
public WoodenPickaxe() {
|
||||
public class WoodenPickaxeItem extends Item {
|
||||
public WoodenPickaxeItem() {
|
||||
super("wooden_pickaxe", "Wooden pickaxe", ItemType.PICKAXE, SpriteLoader.SPRITES.WOODEN_PICKAXE, ToolVariant.WOODEN, 12, 59, false);
|
||||
}
|
||||
}
|
@ -7,8 +7,8 @@ import cz.jzitnik.game.entities.items.ItemType;
|
||||
import cz.jzitnik.game.entities.items.ToolVariant;
|
||||
|
||||
@ItemRegistry("wooden_shovel")
|
||||
public class WoodenShovel extends Item {
|
||||
public WoodenShovel() {
|
||||
public class WoodenShovelItem extends Item {
|
||||
public WoodenShovelItem() {
|
||||
super("wooden_shovel", "Wooden shovel", ItemType.SHOVEL, SpriteLoader.SPRITES.WOODEN_SHOVEL, ToolVariant.WOODEN, 0.3, 59, false);
|
||||
}
|
||||
}
|
@ -198,8 +198,12 @@ public class CowLogic implements EntityLogicInterface, EntitySpawnInterface, Ent
|
||||
|
||||
@Override
|
||||
public void killed(Game game, Block mob) {
|
||||
/*int amount = random.nextInt(2) + 1;
|
||||
InventoryItem inventoryItem = new InventoryItem(amount, ItemBlockSupplier.getItem("mutton"));
|
||||
game.getInventory().addItem(inventoryItem);*/
|
||||
int leatherAmount = random.nextInt(3);
|
||||
InventoryItem inventoryItem = new InventoryItem(leatherAmount, ItemBlockSupplier.getItem("leather"));
|
||||
int beefAmount = random.nextInt(3) + 1;
|
||||
InventoryItem inventoryItem1 = new InventoryItem(beefAmount, ItemBlockSupplier.getItem("beef"));
|
||||
|
||||
game.getInventory().addItem(inventoryItem);
|
||||
game.getInventory().addItem(inventoryItem1);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user