From 3f9ce332315cf63908804ac75d3e7ea4eda10540 Mon Sep 17 00:00:00 2001 From: jull Date: Sat, 29 Mar 2025 11:01:37 +0100 Subject: [PATCH 1/2] chore: dyed wools --- .../recipes/wools/BlackWoolRecipe.java | 15 +++++++++++ .../recipes/wools/BlueWoolRecipe.java | 15 +++++++++++ .../recipes/wools/BrownWoolRecipe.java | 15 +++++++++++ .../recipes/wools/CyanWoolRecipe.java | 15 +++++++++++ .../recipes/wools/GrayWoolRecipe.java | 15 +++++++++++ .../recipes/wools/GreenWoolRecipe.java | 15 +++++++++++ .../recipes/wools/LightBlueWoolRecipe.java | 15 +++++++++++ .../recipes/wools/LightGrayWoolRecipe.java | 15 +++++++++++ .../recipes/wools/LimeWoolRecipe.java | 15 +++++++++++ .../recipes/wools/MagentaWoolRecipe.java | 15 +++++++++++ .../recipes/wools/OrangeWoolRecipe.java | 15 +++++++++++ .../recipes/wools/PinkWoolRecipe.java | 15 +++++++++++ .../recipes/wools/PurpleWoolRecipe.java | 15 +++++++++++ .../crafting/recipes/wools/RedWoolRecipe.java | 15 +++++++++++ .../recipes/wools/WhiteWoolRecipe.java | 15 +++++++++++ .../recipes/wools/YellowWoolRecipe.java | 15 +++++++++++ .../registry/blocks/wools/BlueWoolBlock.java | 14 +++++++++++ .../registry/blocks/wools/CyanWoolBlock.java | 14 +++++++++++ .../registry/blocks/wools/GreenWoolBlock.java | 14 +++++++++++ .../blocks/wools/LightBlueWoolBlock.java | 14 +++++++++++ .../registry/blocks/wools/LimeWoolBlock.java | 14 +++++++++++ .../blocks/wools/MagentaWoolBlock.java | 14 +++++++++++ .../blocks/wools/OrangeWoolBlock.java | 14 +++++++++++ .../blocks/wools/PurpleWoolBlock.java | 14 +++++++++++ .../registry/blocks/wools/RedWoolBlock.java | 14 +++++++++++ .../blocks/wools/YellowWoolBlock.java | 14 +++++++++++ .../registry/items/wools/BlueWoolItem.java | 15 +++++++++++ .../registry/items/wools/CyanWoolItem.java | 15 +++++++++++ .../registry/items/wools/GreenWoolItem.java | 15 +++++++++++ .../items/wools/LightBlueWoolItem.java | 15 +++++++++++ .../registry/items/wools/LimeWoolItem.java | 15 +++++++++++ .../registry/items/wools/MagentaWoolItem.java | 15 +++++++++++ .../registry/items/wools/OrangeWoolItem.java | 15 +++++++++++ .../registry/items/wools/PurpleWoolItem.java | 15 +++++++++++ .../registry/items/wools/RedWoolItem.java | 15 +++++++++++ .../registry/items/wools/YellowWoolItem.java | 15 +++++++++++ .../java/cz/jzitnik/game/sprites/Wool.java | 16 +++++++++--- .../cz/jzitnik/game/sprites/WoolItem.java | 16 +++++++++--- src/main/resources/textures/blue_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/cyan_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/green_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/blue_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/cyan_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/green_wool.ans | 25 +++++++++++++++++++ .../textures/items/light_blue_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/lime_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/magenta_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/orange_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/purple_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/red_wool.ans | 25 +++++++++++++++++++ .../resources/textures/items/yellow_wool.ans | 25 +++++++++++++++++++ .../resources/textures/light_blue_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/lime_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/magenta_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/orange_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/purple_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/red_wool.ans | 25 +++++++++++++++++++ src/main/resources/textures/yellow_wool.ans | 25 +++++++++++++++++++ 58 files changed, 1056 insertions(+), 6 deletions(-) create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlackWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlueWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/BrownWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/CyanWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/GrayWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/GreenWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightBlueWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightGrayWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/LimeWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/MagentaWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/OrangeWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/PinkWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/PurpleWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/RedWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/WhiteWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/crafting/recipes/wools/YellowWoolRecipe.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/BlueWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/CyanWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/GreenWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LightBlueWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LimeWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/MagentaWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/OrangeWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/PurpleWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/RedWoolItem.java create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/YellowWoolItem.java create mode 100644 src/main/resources/textures/blue_wool.ans create mode 100644 src/main/resources/textures/cyan_wool.ans create mode 100644 src/main/resources/textures/green_wool.ans create mode 100644 src/main/resources/textures/items/blue_wool.ans create mode 100644 src/main/resources/textures/items/cyan_wool.ans create mode 100644 src/main/resources/textures/items/green_wool.ans create mode 100644 src/main/resources/textures/items/light_blue_wool.ans create mode 100644 src/main/resources/textures/items/lime_wool.ans create mode 100644 src/main/resources/textures/items/magenta_wool.ans create mode 100644 src/main/resources/textures/items/orange_wool.ans create mode 100644 src/main/resources/textures/items/purple_wool.ans create mode 100644 src/main/resources/textures/items/red_wool.ans create mode 100644 src/main/resources/textures/items/yellow_wool.ans create mode 100644 src/main/resources/textures/light_blue_wool.ans create mode 100644 src/main/resources/textures/lime_wool.ans create mode 100644 src/main/resources/textures/magenta_wool.ans create mode 100644 src/main/resources/textures/orange_wool.ans create mode 100644 src/main/resources/textures/purple_wool.ans create mode 100644 src/main/resources/textures/red_wool.ans create mode 100644 src/main/resources/textures/yellow_wool.ans diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlackWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlackWoolRecipe.java new file mode 100644 index 0000000..d4c0250 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlackWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^black_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "black_wool", + amount = 8, + usingRegex = true +) +public class BlackWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlueWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlueWoolRecipe.java new file mode 100644 index 0000000..9c89435 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BlueWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^blue_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "blue_wool", + amount = 8, + usingRegex = true +) +public class BlueWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BrownWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BrownWoolRecipe.java new file mode 100644 index 0000000..b23ceee --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/BrownWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^brown_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "brown_wool", + amount = 8, + usingRegex = true +) +public class BrownWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/CyanWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/CyanWoolRecipe.java new file mode 100644 index 0000000..bc058d8 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/CyanWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^cyan_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "cyan_wool", + amount = 8, + usingRegex = true +) +public class CyanWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/GrayWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/GrayWoolRecipe.java new file mode 100644 index 0000000..52286f3 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/GrayWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^gray_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "gray_wool", + amount = 8, + usingRegex = true +) +public class GrayWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/GreenWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/GreenWoolRecipe.java new file mode 100644 index 0000000..fe42ef6 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/GreenWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^green_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "green_wool", + amount = 8, + usingRegex = true +) +public class GreenWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightBlueWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightBlueWoolRecipe.java new file mode 100644 index 0000000..f0b83cb --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightBlueWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^light_blue_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "light_blue_wool", + amount = 8, + usingRegex = true +) +public class LightBlueWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightGrayWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightGrayWoolRecipe.java new file mode 100644 index 0000000..cd94de3 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LightGrayWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^light_gray_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "light_gray_wool", + amount = 8, + usingRegex = true +) +public class LightGrayWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LimeWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LimeWoolRecipe.java new file mode 100644 index 0000000..7724837 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/LimeWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^lime_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "lime_wool", + amount = 8, + usingRegex = true +) +public class LimeWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/MagentaWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/MagentaWoolRecipe.java new file mode 100644 index 0000000..479def8 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/MagentaWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^magenta_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "magenta_wool", + amount = 8, + usingRegex = true +) +public class MagentaWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/OrangeWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/OrangeWoolRecipe.java new file mode 100644 index 0000000..c8f72ca --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/OrangeWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^orange_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "orange_wool", + amount = 8, + usingRegex = true +) +public class OrangeWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/PinkWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/PinkWoolRecipe.java new file mode 100644 index 0000000..5d6a2bf --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/PinkWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^pink_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "pink_wool", + amount = 8, + usingRegex = true +) +public class PinkWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/PurpleWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/PurpleWoolRecipe.java new file mode 100644 index 0000000..95b574e --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/PurpleWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^purple_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "purple_wool", + amount = 8, + usingRegex = true +) +public class PurpleWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/RedWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/RedWoolRecipe.java new file mode 100644 index 0000000..8c2dbcf --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/RedWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^red_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "red_wool", + amount = 8, + usingRegex = true +) +public class RedWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/WhiteWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/WhiteWoolRecipe.java new file mode 100644 index 0000000..ddedcd0 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/WhiteWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^white_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "white_wool", + amount = 8, + usingRegex = true +) +public class WhiteWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/crafting/recipes/wools/YellowWoolRecipe.java b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/YellowWoolRecipe.java new file mode 100644 index 0000000..f717f0e --- /dev/null +++ b/src/main/java/cz/jzitnik/game/crafting/recipes/wools/YellowWoolRecipe.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.crafting.recipes.wools; + +import cz.jzitnik.game.annotations.CraftingRecipeRegistry; + +@CraftingRecipeRegistry( + recipe = { + "^.*_wool$", "^.*_wool$", "^.*_wool$", + "^.*_wool$", "^yellow_dye$", "^.*_wool$", + "^.*_wool$", "^.*_wool$", "^.*_wool$" + }, + result = "yellow_wool", + amount = 8, + usingRegex = true +) +public class YellowWoolRecipe {} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java new file mode 100644 index 0000000..f578784 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/BlueWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("blue_wool") +public class BlueWoolBlock extends Block { + public BlueWoolBlock() { + super("blue_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.BLUE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java new file mode 100644 index 0000000..91e3eef --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/CyanWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("cyan_wool") +public class CyanWoolBlock extends Block { + public CyanWoolBlock() { + super("cyan_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.CYAN); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java new file mode 100644 index 0000000..1fb401b --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/GreenWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("green_wool") +public class GreenWoolBlock extends Block { + public GreenWoolBlock() { + super("green_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.GREEN); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java new file mode 100644 index 0000000..629cd28 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LightBlueWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("light_blue_wool") +public class LightBlueWoolBlock extends Block { + public LightBlueWoolBlock() { + super("light_blue_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.LIGHT_BLUE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java new file mode 100644 index 0000000..d3c0b17 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/LimeWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("lime_wool") +public class LimeWoolBlock extends Block { + public LimeWoolBlock() { + super("lime_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.LIME); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java new file mode 100644 index 0000000..1e380b4 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/MagentaWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("magenta_wool") +public class MagentaWoolBlock extends Block { + public MagentaWoolBlock() { + super("magenta_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.MAGENTA); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java new file mode 100644 index 0000000..8d21970 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/OrangeWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("orange_wool") +public class OrangeWoolBlock extends Block { + public OrangeWoolBlock() { + super("orange_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.ORANGE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java new file mode 100644 index 0000000..192345c --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/PurpleWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("purple_wool") +public class PurpleWoolBlock extends Block { + public PurpleWoolBlock() { + super("purple_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.PURPLE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java new file mode 100644 index 0000000..676f170 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/RedWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("red_wool") +public class RedWoolBlock extends Block { + public RedWoolBlock() { + super("red_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.RED); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java new file mode 100644 index 0000000..d65eedc --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/blocks/wools/YellowWoolBlock.java @@ -0,0 +1,14 @@ +package cz.jzitnik.game.entities.items.registry.blocks.wools; + +import cz.jzitnik.game.SpriteLoader; +import cz.jzitnik.game.annotations.BlockRegistry; +import cz.jzitnik.game.entities.Block; +import cz.jzitnik.game.sprites.Wool; + +@BlockRegistry("yellow_wool") +public class YellowWoolBlock extends Block { + public YellowWoolBlock() { + super("yellow_wool", SpriteLoader.SPRITES.WOOL, 3); + setSpriteState(Wool.WoolState.YELLOW); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/BlueWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/BlueWoolItem.java new file mode 100644 index 0000000..e65d8bc --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/BlueWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("blue_wool") +public class BlueWoolItem extends Item { + public BlueWoolItem() { + super("blue_wool", "Blue wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.BLUE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/CyanWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/CyanWoolItem.java new file mode 100644 index 0000000..cb5b373 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/CyanWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("cyan_wool") +public class CyanWoolItem extends Item { + public CyanWoolItem() { + super("cyan_wool", "Cyan wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.CYAN); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/GreenWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/GreenWoolItem.java new file mode 100644 index 0000000..a8119cd --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/GreenWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("green_wool") +public class GreenWoolItem extends Item { + public GreenWoolItem() { + super("green_wool", "Green wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.GREEN); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LightBlueWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LightBlueWoolItem.java new file mode 100644 index 0000000..a75e3a2 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LightBlueWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("light_blue_wool") +public class LightBlueWoolItem extends Item { + public LightBlueWoolItem() { + super("light_blue_wool", "Light blue wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.LIGHT_BLUE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LimeWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LimeWoolItem.java new file mode 100644 index 0000000..1780155 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/LimeWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("lime_wool") +public class LimeWoolItem extends Item { + public LimeWoolItem() { + super("lime_wool", "Lime wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.LIME); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/MagentaWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/MagentaWoolItem.java new file mode 100644 index 0000000..710a169 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/MagentaWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("magenta_wool") +public class MagentaWoolItem extends Item { + public MagentaWoolItem() { + super("magenta_wool", "Magenta wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.MAGENTA); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/OrangeWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/OrangeWoolItem.java new file mode 100644 index 0000000..fb25e35 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/OrangeWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("orange_wool") +public class OrangeWoolItem extends Item { + public OrangeWoolItem() { + super("orange_wool", "Orange wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.ORANGE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/PurpleWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/PurpleWoolItem.java new file mode 100644 index 0000000..d81db43 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/PurpleWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("purple_wool") +public class PurpleWoolItem extends Item { + public PurpleWoolItem() { + super("purple_wool", "Purple wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.PURPLE); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/RedWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/RedWoolItem.java new file mode 100644 index 0000000..df76447 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/RedWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("red_wool") +public class RedWoolItem extends Item { + public RedWoolItem() { + super("red_wool", "Red wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.RED); + } +} diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/YellowWoolItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/YellowWoolItem.java new file mode 100644 index 0000000..7928451 --- /dev/null +++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/wools/YellowWoolItem.java @@ -0,0 +1,15 @@ +package cz.jzitnik.game.entities.items.registry.items.wools; + +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; +import cz.jzitnik.game.sprites.WoolItem; + +@ItemRegistry("yellow_wool") +public class YellowWoolItem extends Item { + public YellowWoolItem() { + super("yellow_wool", "Yellow wool", ItemType.BLOCK, SpriteLoader.SPRITES.ITEM_WOOL); + setSpriteState(WoolItem.WoolItemState.YELLOW); + } +} diff --git a/src/main/java/cz/jzitnik/game/sprites/Wool.java b/src/main/java/cz/jzitnik/game/sprites/Wool.java index 8ac00da..2c1d886 100644 --- a/src/main/java/cz/jzitnik/game/sprites/Wool.java +++ b/src/main/java/cz/jzitnik/game/sprites/Wool.java @@ -6,18 +6,28 @@ import java.util.HashMap; public class Wool extends Sprite { public enum WoolState { - WHITE, LIGHT_GRAY, GRAY, BLACK, BROWN, PINK, + RED, ORANGE, YELLOW, LIME, GREEN, CYAN, LIGHT_BLUE, BLUE, PURPLE, MAGENTA, PINK, WHITE, LIGHT_GRAY, GRAY, BROWN, BLACK } public Wool() { loadResources(new HashMap<>() { { + put(WoolState.RED, "red_wool.ans"); + put(WoolState.ORANGE, "orange_wool.ans"); + put(WoolState.YELLOW, "yellow_wool.ans"); + put(WoolState.LIME, "lime_wool.ans"); + put(WoolState.GREEN, "green_wool.ans"); + put(WoolState.CYAN, "cyan_wool.ans"); + put(WoolState.LIGHT_BLUE, "light_blue_wool.ans"); + put(WoolState.BLUE, "blue_wool.ans"); + put(WoolState.PURPLE, "purple_wool.ans"); + put(WoolState.MAGENTA, "magenta_wool.ans"); + put(WoolState.PINK, "pink_wool.ans"); put(WoolState.WHITE, "white_wool.ans"); put(WoolState.LIGHT_GRAY, "light_gray_wool.ans"); put(WoolState.GRAY, "gray_wool.ans"); - put(WoolState.BLACK, "black_wool.ans"); put(WoolState.BROWN, "brown_wool.ans"); - put(WoolState.PINK, "pink_wool.ans"); + put(WoolState.BLACK, "black_wool.ans"); } }, WoolState.class); } diff --git a/src/main/java/cz/jzitnik/game/sprites/WoolItem.java b/src/main/java/cz/jzitnik/game/sprites/WoolItem.java index 28e2b22..90f4c4b 100644 --- a/src/main/java/cz/jzitnik/game/sprites/WoolItem.java +++ b/src/main/java/cz/jzitnik/game/sprites/WoolItem.java @@ -6,18 +6,28 @@ import java.util.HashMap; public class WoolItem extends Sprite { public enum WoolItemState { - WHITE, LIGHT_GRAY, GRAY, BLACK, BROWN, PINK, + RED, ORANGE, YELLOW, LIME, GREEN, CYAN, LIGHT_BLUE, BLUE, PURPLE, MAGENTA, PINK, WHITE, LIGHT_GRAY, GRAY, BROWN, BLACK } public WoolItem() { loadResources(new HashMap<>() { { + put(WoolItemState.RED, "items/red_wool.ans"); + put(WoolItemState.ORANGE, "items/orange_wool.ans"); + put(WoolItemState.YELLOW, "items/yellow_wool.ans"); + put(WoolItemState.LIME, "items/lime_wool.ans"); + put(WoolItemState.GREEN, "items/green_wool.ans"); + put(WoolItemState.CYAN, "items/cyan_wool.ans"); + put(WoolItemState.LIGHT_BLUE, "items/light_blue_wool.ans"); + put(WoolItemState.BLUE, "items/blue_wool.ans"); + put(WoolItemState.PURPLE, "items/purple_wool.ans"); + put(WoolItemState.MAGENTA, "items/magenta_wool.ans"); + put(WoolItemState.PINK, "items/pink_wool.ans"); put(WoolItemState.WHITE, "items/white_wool.ans"); put(WoolItemState.LIGHT_GRAY, "items/light_gray_wool.ans"); put(WoolItemState.GRAY, "items/gray_wool.ans"); - put(WoolItemState.BLACK, "items/black_wool.ans"); put(WoolItemState.BROWN, "items/brown_wool.ans"); - put(WoolItemState.PINK, "items/pink_wool.ans"); + put(WoolItemState.BLACK, "items/black_wool.ans"); } }, WoolItemState.class); } diff --git a/src/main/resources/textures/blue_wool.ans b/src/main/resources/textures/blue_wool.ans new file mode 100644 index 0000000..c461d20 --- /dev/null +++ b/src/main/resources/textures/blue_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +               +               +                 +              +              +               +                 +                 +               +               +                +               +               +                +                 +                 +                +                 +                 diff --git a/src/main/resources/textures/cyan_wool.ans b/src/main/resources/textures/cyan_wool.ans new file mode 100644 index 0000000..9025844 --- /dev/null +++ b/src/main/resources/textures/cyan_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +               +               +                 +              +              +              +                 +                 +               +               +                +               +               +                +                 +                 +                 +                 +                 diff --git a/src/main/resources/textures/green_wool.ans b/src/main/resources/textures/green_wool.ans new file mode 100644 index 0000000..3903b6c --- /dev/null +++ b/src/main/resources/textures/green_wool.ans @@ -0,0 +1,25 @@ +                +                +               +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +               +               +               +                 +                 +                 +                 +                 diff --git a/src/main/resources/textures/items/blue_wool.ans b/src/main/resources/textures/items/blue_wool.ans new file mode 100644 index 0000000..0a85a61 --- /dev/null +++ b/src/main/resources/textures/items/blue_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                             +                            +                            +                           +                           +                            +                         +                           +                         +                         +                        +                           +                            +                            +                              +                                 +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/cyan_wool.ans b/src/main/resources/textures/items/cyan_wool.ans new file mode 100644 index 0000000..5838a5f --- /dev/null +++ b/src/main/resources/textures/items/cyan_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                          +                            +                            +                            +                           +                           +                           +                            +                            +                            +                              +                                  +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/green_wool.ans b/src/main/resources/textures/items/green_wool.ans new file mode 100644 index 0000000..fbae3c4 --- /dev/null +++ b/src/main/resources/textures/items/green_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                     +                                  +                              +                            +                            +                            +                           +                           +                           +                           +                          +                          +                         +                           +                            +                           +                             +                                 +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/light_blue_wool.ans b/src/main/resources/textures/items/light_blue_wool.ans new file mode 100644 index 0000000..8a37566 --- /dev/null +++ b/src/main/resources/textures/items/light_blue_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                           +                           +                           +                          +                            +                            +                           +                            +                            +                            +                              +                                  +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/lime_wool.ans b/src/main/resources/textures/items/lime_wool.ans new file mode 100644 index 0000000..e437417 --- /dev/null +++ b/src/main/resources/textures/items/lime_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                           +                           +                           +                           +                            +                            +                           +                            +                            +                            +                             +                                  +                                      +                                          +                                             +                                                  diff --git a/src/main/resources/textures/items/magenta_wool.ans b/src/main/resources/textures/items/magenta_wool.ans new file mode 100644 index 0000000..1271300 --- /dev/null +++ b/src/main/resources/textures/items/magenta_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                             +                            +                           +                            +                            +                            +                           +                           +                           +                           +                           +                            +                            +                           +                              +                                 +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/orange_wool.ans b/src/main/resources/textures/items/orange_wool.ans new file mode 100644 index 0000000..4d7bd94 --- /dev/null +++ b/src/main/resources/textures/items/orange_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                            +                            +                            +                            +                            +                            +                           +                            +                            +                           +                              +                                  +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/purple_wool.ans b/src/main/resources/textures/items/purple_wool.ans new file mode 100644 index 0000000..b425061 --- /dev/null +++ b/src/main/resources/textures/items/purple_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                            +                            +                           +                          +                          +                          +                          +                            +                            +                            +                              +                                  +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/items/red_wool.ans b/src/main/resources/textures/items/red_wool.ans new file mode 100644 index 0000000..1e1e275 --- /dev/null +++ b/src/main/resources/textures/items/red_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                         +                          +                        +                            +                          +                        +                         +                          +                           +                            +                              +                                  +                                      +                                          +                                             +                                                  diff --git a/src/main/resources/textures/items/yellow_wool.ans b/src/main/resources/textures/items/yellow_wool.ans new file mode 100644 index 0000000..d68b4b3 --- /dev/null +++ b/src/main/resources/textures/items/yellow_wool.ans @@ -0,0 +1,25 @@ +                                                  +                                              +                                          +                                      +                                  +                              +                            +                            +                            +                            +                            +                           +                            +                            +                           +                           +                           +                            +                            +                              +                                  +                                      +                                          +                                              +                                                  diff --git a/src/main/resources/textures/light_blue_wool.ans b/src/main/resources/textures/light_blue_wool.ans new file mode 100644 index 0000000..662d8c1 --- /dev/null +++ b/src/main/resources/textures/light_blue_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +               +               +                +                 +                 +                 +                 +                 diff --git a/src/main/resources/textures/lime_wool.ans b/src/main/resources/textures/lime_wool.ans new file mode 100644 index 0000000..77ed652 --- /dev/null +++ b/src/main/resources/textures/lime_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +                +                +                +                 +                 +                +                 +                 diff --git a/src/main/resources/textures/magenta_wool.ans b/src/main/resources/textures/magenta_wool.ans new file mode 100644 index 0000000..5b24885 --- /dev/null +++ b/src/main/resources/textures/magenta_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                +                +               +               +                +               +               +                +                 +                 +                 +                 +                 diff --git a/src/main/resources/textures/orange_wool.ans b/src/main/resources/textures/orange_wool.ans new file mode 100644 index 0000000..406afd8 --- /dev/null +++ b/src/main/resources/textures/orange_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +                +                +                +                 +                 +                 +                 +                 diff --git a/src/main/resources/textures/purple_wool.ans b/src/main/resources/textures/purple_wool.ans new file mode 100644 index 0000000..95fccf4 --- /dev/null +++ b/src/main/resources/textures/purple_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +               +               +                +                 +                 +                 +                 +                 diff --git a/src/main/resources/textures/red_wool.ans b/src/main/resources/textures/red_wool.ans new file mode 100644 index 0000000..b2bbc90 --- /dev/null +++ b/src/main/resources/textures/red_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +              +              +               +                +                +                 +                 +                 diff --git a/src/main/resources/textures/yellow_wool.ans b/src/main/resources/textures/yellow_wool.ans new file mode 100644 index 0000000..a230b13 --- /dev/null +++ b/src/main/resources/textures/yellow_wool.ans @@ -0,0 +1,25 @@ +                +                +                +                +                +                +                +                +                 +              +              +               +                 +                 +               +               +                +               +               +                +                 +                 +                 +                 +                 From 077c7484c40e338e85a2634e4c7aaaf3901117c0 Mon Sep 17 00:00:00 2001 From: jull Date: Sat, 29 Mar 2025 14:24:32 +0100 Subject: [PATCH 2/2] chore: wheat stages --- .../java/cz/jzitnik/game/SpriteLoader.java | 2 +- src/main/resources/textures/wheat_stage1.ans | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/textures/wheat_stage1.ans diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java index cbc30d0..5300eed 100644 --- a/src/main/java/cz/jzitnik/game/SpriteLoader.java +++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java @@ -277,7 +277,7 @@ public class SpriteLoader { SPRITES_MAP.put(SPRITES.NUMBER, new Number()); // SEEDS - SPRITES_MAP.put(SPRITES.WHEAT, new Farmable("dirt.ans", "grass.ans", "sand.ans")); + SPRITES_MAP.put(SPRITES.WHEAT, new Farmable("wheat_stage1.ans", "wheat_stage2.ans", "wheat_stage3.ans")); // ITEMS diff --git a/src/main/resources/textures/wheat_stage1.ans b/src/main/resources/textures/wheat_stage1.ans new file mode 100644 index 0000000..7d62782 --- /dev/null +++ b/src/main/resources/textures/wheat_stage1.ans @@ -0,0 +1,25 @@ +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                   +                                                  +                                                  +                                               +                                             +                                             +                                        +                                        +