From cd0be8dad49bcf1f608ddff03d3f90f4399bea8b Mon Sep 17 00:00:00 2001
From: jzitnik-dev <email@jzitnik.dev>
Date: Sun, 2 Mar 2025 13:49:39 +0100
Subject: [PATCH] feat: Added beef and leather

---
 .../java/cz/jzitnik/game/SpriteLoader.java    |  6 +++++
 .../items/registry/items/BeefItem.java        | 13 ++++++++++
 ...dPorkchop.java => CookedPorkchopItem.java} |  4 +--
 .../items/registry/items/LeatherItem.java     | 13 ++++++++++
 .../items/{Mutton.java => MuttonItem.java}    |  4 +--
 .../{Porkchop.java => PorkchopItem.java}      |  4 +--
 .../items/registry/items/SteakItem.java       | 13 ++++++++++
 .../items/{Stick.java => StickItem.java}      |  4 +--
 .../{StoneAxe.java => StoneAxeItem.java}      |  4 +--
 .../{StoneItem.java => StoneItemItem.java}    |  4 +--
 ...tonePickaxe.java => StonePickaxeItem.java} |  4 +--
 ...{StoneShovel.java => StoneShovelItem.java} |  4 +--
 .../{WoodenAxe.java => WoodenAxeItem.java}    |  6 ++---
 ...denPickaxe.java => WoodenPickaxeItem.java} |  4 +--
 ...oodenShovel.java => WoodenShovelItem.java} |  4 +--
 .../game/mobs/services/cow/CowLogic.java      | 10 +++++---
 src/main/resources/textures/items/beef.ans    | 25 +++++++++++++++++++
 src/main/resources/textures/items/leather.ans | 25 +++++++++++++++++++
 src/main/resources/textures/items/steak.ans   | 25 +++++++++++++++++++
 19 files changed, 150 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/BeefItem.java
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{CookedPorkchop.java => CookedPorkchopItem.java} (82%)
 create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/LeatherItem.java
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{Mutton.java => MuttonItem.java} (84%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{Porkchop.java => PorkchopItem.java} (83%)
 create mode 100644 src/main/java/cz/jzitnik/game/entities/items/registry/items/SteakItem.java
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{Stick.java => StickItem.java} (84%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{StoneAxe.java => StoneAxeItem.java} (86%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{StoneItem.java => StoneItemItem.java} (83%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{StonePickaxe.java => StonePickaxeItem.java} (85%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{StoneShovel.java => StoneShovelItem.java} (85%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{WoodenAxe.java => WoodenAxeItem.java} (74%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{WoodenPickaxe.java => WoodenPickaxeItem.java} (85%)
 rename src/main/java/cz/jzitnik/game/entities/items/registry/items/{WoodenShovel.java => WoodenShovelItem.java} (85%)
 create mode 100644 src/main/resources/textures/items/beef.ans
 create mode 100644 src/main/resources/textures/items/leather.ans
 create mode 100644 src/main/resources/textures/items/steak.ans

diff --git a/src/main/java/cz/jzitnik/game/SpriteLoader.java b/src/main/java/cz/jzitnik/game/SpriteLoader.java
index ba9ab59..d3013e2 100644
--- a/src/main/java/cz/jzitnik/game/SpriteLoader.java
+++ b/src/main/java/cz/jzitnik/game/SpriteLoader.java
@@ -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() {
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/BeefItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/BeefItem.java
new file mode 100644
index 0000000..344a6b2
--- /dev/null
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/BeefItem.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("beef")
+public class BeefItem extends Item {
+    public BeefItem() {
+        super("beef", "Beef", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_BEEF, 2);
+    }
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/CookedPorkchop.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/CookedPorkchopItem.java
similarity index 82%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/CookedPorkchop.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/CookedPorkchopItem.java
index 6ba3d34..b1e6648 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/CookedPorkchop.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/CookedPorkchopItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/LeatherItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/LeatherItem.java
new file mode 100644
index 0000000..fe27a67
--- /dev/null
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/LeatherItem.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("leather")
+public class LeatherItem extends Item {
+    public LeatherItem() {
+        super("leather", "Leather", ItemType.USELESS_ITEM, SpriteLoader.SPRITES.ITEM_LEATHER);
+    }
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/Mutton.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/MuttonItem.java
similarity index 84%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/Mutton.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/MuttonItem.java
index 9527b17..8996c72 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/Mutton.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/MuttonItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/Porkchop.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/PorkchopItem.java
similarity index 83%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/Porkchop.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/PorkchopItem.java
index fadea8a..1d2c467 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/Porkchop.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/PorkchopItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/SteakItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/SteakItem.java
new file mode 100644
index 0000000..b701b7a
--- /dev/null
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/SteakItem.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("steak")
+public class SteakItem extends Item {
+    public SteakItem() {
+        super("steak", "Steak", ItemType.FOOD, SpriteLoader.SPRITES.ITEM_BEEF, 4);
+    }
+}
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/Stick.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StickItem.java
similarity index 84%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/Stick.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/StickItem.java
index b2ba86d..5876df5 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/Stick.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StickItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneAxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneAxeItem.java
similarity index 86%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneAxe.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneAxeItem.java
index 36daa8c..ce9d240 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneAxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneAxeItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneItem.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneItemItem.java
similarity index 83%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneItem.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneItemItem.java
index 5f07f41..be06b3c 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneItem.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneItemItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java
similarity index 85%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxe.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java
index ce651d8..4736ad3 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StonePickaxeItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovel.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java
similarity index 85%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovel.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java
index 63fa81e..ebb3eff 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovel.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/StoneShovelItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java
similarity index 74%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxe.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java
index 3a58e0a..6027a51 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenAxeItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxe.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java
similarity index 85%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxe.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java
index ba4d156..52afa21 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxe.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenPickaxeItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovel.java b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java
similarity index 85%
rename from src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovel.java
rename to src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java
index f1450f5..33e5ee1 100644
--- a/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovel.java
+++ b/src/main/java/cz/jzitnik/game/entities/items/registry/items/WoodenShovelItem.java
@@ -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);
     }
 }
diff --git a/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java b/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java
index 53629d6..7cd87f1 100644
--- a/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java
+++ b/src/main/java/cz/jzitnik/game/mobs/services/cow/CowLogic.java
@@ -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);
     }
 }
diff --git a/src/main/resources/textures/items/beef.ans b/src/main/resources/textures/items/beef.ans
new file mode 100644
index 0000000..8bf3070
--- /dev/null
+++ b/src/main/resources/textures/items/beef.ans
@@ -0,0 +1,25 @@
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
diff --git a/src/main/resources/textures/items/leather.ans b/src/main/resources/textures/items/leather.ans
new file mode 100644
index 0000000..5538764
--- /dev/null
+++ b/src/main/resources/textures/items/leather.ans
@@ -0,0 +1,25 @@
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
diff --git a/src/main/resources/textures/items/steak.ans b/src/main/resources/textures/items/steak.ans
new file mode 100644
index 0000000..04f5185
--- /dev/null
+++ b/src/main/resources/textures/items/steak.ans
@@ -0,0 +1,25 @@
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+                                                  
+