From a411caadca5a8443c9dc113f8699c94816a5fabf Mon Sep 17 00:00:00 2001
From: Lucas Delanier <delanierlucas@gmail.com>
Date: Mon, 13 Mar 2023 13:41:32 +0100
Subject: [PATCH] test to manage problems with stack

---
 .../java/com/example/shakecraft/MainActivity.kt    |  5 ++++-
 .../main/java/com/example/shakecraft/data/Stub.kt  | 14 +++++++-------
 .../java/com/example/shakecraft/model/Player.kt    |  2 +-
 .../com/example/shakecraft/model/RecipeManager.kt  |  6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt
index f2dd22a..33c0a40 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/MainActivity.kt
@@ -10,6 +10,7 @@ import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.WindowInsetsControllerCompat
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
+import com.example.shakecraft.data.Stub
 import com.example.shakecraft.model.Player
 import com.example.shakecraft.model.Recipe
 import com.google.android.material.bottomnavigation.BottomNavigationView
@@ -17,7 +18,9 @@ import com.google.android.material.bottomnavigation.BottomNavigationView
 class MainActivity : AppCompatActivity() {
 
 
-    var currentPlayer = Player("Winker",0)
+    var currentPlayer = Stub().load()
+
+
     @RequiresApi(Build.VERSION_CODES.R)
     private fun hideSystemUI() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt
index c6dfaf4..892bb1e 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/data/Stub.kt
@@ -7,16 +7,16 @@ import com.example.shakecraft.model.Player
 
 class Stub {
 
-    fun load() : List<Item>{
+    fun load() : Player{
+        var currentPlayer : Player = Player("Winker",0)
         val items : MutableList<Item> = mutableListOf<Item>()
-        items.add(Item(name = "Beech Log", rarity = 1, stack = 1,  R.drawable.ic_anvil, xpReward = 10 ))
-        items.add(Item(name = "Bronze Ore", rarity = 2, stack = 1,  R.drawable.ic_anvil, xpReward = 20))
-        items.add(Item(name = "Iron Ore", rarity = 3, stack = 1,  R.drawable.ic_anvil, xpReward = 30))
-        items.add(Item(name = "Diamond", rarity = 3, stack = 1,  R.drawable.ic_anvil, xpReward = 30))
-        return items
+        items.add(Item(name = "Beech Log", rarity = 1, stack = 30,  R.drawable.log2, xpReward = 10 ))
+
+        currentPlayer.items = items
+        return currentPlayer
     }
 
 
-    var currentPlayer : Player = Player("Winker",0)
+
 
 }
\ No newline at end of file
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt
index 12f8c05..51accc8 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/Player.kt
@@ -3,7 +3,7 @@ package com.example.shakecraft.model
 class Player(val pseudo: String, var xp: Int = 0) {
     var level: Int = 1
 
-    val items: MutableList<Item> = mutableListOf()
+    var items: MutableList<Item> = mutableListOf()
     var rank: String = "Beginner"
 
 
diff --git a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt
index c8842ce..33c3902 100644
--- a/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt
+++ b/ShakeAndCraft/app/src/main/java/com/example/shakecraft/model/RecipeManager.kt
@@ -8,7 +8,7 @@ class RecipeManager {
 
     companion object {
 
-        var recipeListObjects : List<Recipe> = listOf(
+        val recipeListObjects : List<Recipe> = listOf(
             Recipe(
                 Item("Wooden Stick", image = R.drawable.wooden_stick, stack = 1),listOf(
                     Item("Wooden Plank", image = R.drawable.wooden_plank, stack = 2)
@@ -24,7 +24,7 @@ class RecipeManager {
                 ), "Objects"),
 
         )
-        var recipeListTools : List<Recipe> = listOf(
+        val recipeListTools : List<Recipe> = listOf(
 
             Recipe(
                 Item("Bronze Sword", image = R.drawable.bronze_sword, stack = 1),listOf(
@@ -45,7 +45,7 @@ class RecipeManager {
 
                     ), "Tools"),
         )
-        var recipeListBlacksmithing : List<Recipe> = listOf(
+        val recipeListBlacksmithing : List<Recipe> = listOf(
 
             Recipe(
                 Item("Bronze Ingot", image = R.drawable.bronze_ingot, stack = 1),listOf(