modif2

Minecraft.Crafting.Api/Controllers/CraftingController.cs

@@ -44,6 +44,9 @@ namespace Minecraft.Crafting.Api.Controllers
                 throw new Exception("Unable to get the items.");
             }
 
+            // Simulate the Id
+            item.Id = data.Max(s => s.Id) + 1;
+
             data.Add(item);
 
             System.IO.File.WriteAllText("Data/items.json", JsonSerializer.Serialize(data, _jsonSerializerOptions));
@@ -51,6 +54,24 @@ namespace Minecraft.Crafting.Api.Controllers
             return Task.CompletedTask;
         }
 
+        /// <summary>
+        /// Get all items.
+        /// </summary>
+        /// <returns>All items.</returns>
+        [HttpGet]
+        [Route("all")]
+        public Task<List<Item>> All()
+        {
+            var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
+
+            if (data == null)
+            {
+                throw new Exception("Unable to get the items.");
+            }
+
+            return Task.FromResult(data.ToList());
+        }
+
         /// <summary>
         /// Count the number of items.
         /// </summary>
@@ -125,6 +146,34 @@ namespace Minecraft.Crafting.Api.Controllers
             return Task.FromResult(item);
         }
 
+        /// <summary>
+        /// Gets the item by name.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <returns>
+        /// The item.
+        /// </returns>
+        [HttpGet]
+        [Route("by-name/{name}")]
+        public Task<Item> GetByName(string name)
+        {
+            var data = JsonSerializer.Deserialize<List<Item>>(System.IO.File.ReadAllText("Data/items.json"), _jsonSerializerOptions);
+
+            if (data == null)
+            {
+                throw new Exception("Unable to get the items.");
+            }
+
+            var item = data.FirstOrDefault(w => w.Name.ToLowerInvariant() == name.ToLowerInvariant());
+
+            if (item == null)
+            {
+                throw new Exception($"Unable to found the item with name: {name}");
+            }
+
+            return Task.FromResult(item);
+        }
+
         /// <summary>
         /// Gets the recipes.
         /// </summary>
@@ -190,6 +239,15 @@ namespace Minecraft.Crafting.Api.Controllers
 
             var defaultImage = Convert.ToBase64String(System.IO.File.ReadAllBytes("Images/default.png"));
 
+            var imageTranslation = new Dictionary<string, string>
+            {
+                { "stone_slab", "smooth_stone_slab_side" },
+                { "sticky_piston", "piston_top_sticky" },
+                { "mob_spawner", "spawner" },
+                { "chest", "chest_minecart" },
+                { "stone_stairs", "stairs" },
+            };
+
             foreach (var item in data)
             {
                 var imageFilepath = defaultImage;
@@ -199,6 +257,36 @@ namespace Minecraft.Crafting.Api.Controllers
                     imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{item.Name}.png"));
                 }
 
+                if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/{item.Name}_top.png"))
+                {
+                    imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{item.Name}_top.png"));
+                }
+
+                if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/{item.Name}_front.png"))
+                {
+                    imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{item.Name}_front.png"));
+                }
+
+                if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/white_{item.Name}.png"))
+                {
+                    imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/white_{item.Name}.png"));
+                }
+
+                if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/oak_{item.Name}.png"))
+                {
+                    imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/oak_{item.Name}.png"));
+                }
+
+                if (imageFilepath == defaultImage && System.IO.File.Exists($"Images/{item.DisplayName.ToLower().Replace(" ", "_")}.png"))
+                {
+                    imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{item.DisplayName.ToLower().Replace(" ", "_")}.png"));
+                }
+
+                if (imageFilepath == defaultImage && imageTranslation.ContainsKey(item.Name))
+                {
+                    imageFilepath = Convert.ToBase64String(System.IO.File.ReadAllBytes($"Images/{imageTranslation[item.Name]}.png"));
+                }
+
                 item.ImageBase64 = imageFilepath;
             }
 
@@ -253,6 +341,7 @@ namespace Minecraft.Crafting.Api.Controllers
             itemOriginal.RepairWith = item.RepairWith;
             itemOriginal.StackSize = item.StackSize;
             itemOriginal.UpdatedDate = item.UpdatedDate;
+            itemOriginal.ImageBase64 = item.ImageBase64;
 
             System.IO.File.WriteAllText("Data/items.json", JsonSerializer.Serialize(data, _jsonSerializerOptions));
 
@@ -333,7 +422,7 @@ namespace Minecraft.Crafting.Api.Controllers
 
                 items.Add(new Recipe
                 {
-                    Give = new Item { DisplayName = giveItem.DisplayName, Name = giveItem.Name },
+                    Give = giveItem,
                     Have = new List<List<string>>
                     {
                         new()

Minecraft.Crafting.Api/Controllers/InventoryController.cs

@@ -112,11 +112,11 @@ namespace Minecraft.Crafting.Api.Controllers
         /// <summary>
         /// Updates the inventory.
         /// </summary>
-        /// <param name="infos">The infos about the item (name, position, number, stacksize).</param>
+        /// <param name="item">The item.</param>
         /// <returns>The async task.</returns>
         [HttpPut]
         [Route("")]
-        public Task UpdateInventory(string[] infos)
+        public Task UpdateInventory(InventoryModel item)
         {
             var data = JsonSerializer.Deserialize<List<InventoryModel>>(System.IO.File.ReadAllText("Data/inventory.json"), _jsonSerializerOptions);
 
@@ -125,10 +125,15 @@ namespace Minecraft.Crafting.Api.Controllers
                 throw new Exception("Unable to get the inventory.");
             }
 
-            data.ToArray()[Int32.Parse(infos[1]) - 1].ItemName = infos[0];
-            data.ToArray()[Int32.Parse(infos[1]) - 1].Position = Int32.Parse(infos[1]);
-            data.ToArray()[Int32.Parse(infos[1]) - 1].Number = Int32.Parse(infos[2]);
-            data.ToArray()[Int32.Parse(infos[1]) - 1].StackSize = Int32.Parse(infos[3]);
+            var inventoryItem = data.FirstOrDefault(w => w.ItemName == item.ItemName && w.Position == item.Position);
+
+            if (inventoryItem == null)
+            {
+                throw new Exception($"Unable to found the item with name: {item.ItemName} at position: {item.Position}");
+            }
+
+            inventoryItem.ItemName = item.ItemName;
+            inventoryItem.Position = item.Position;
 
             System.IO.File.WriteAllText("Data/inventory.json", JsonSerializer.Serialize(data, _jsonSerializerOptions));
 

Minecraft.Crafting.Api/Data/inventory.json

@@ -1,82 +0,0 @@
-[
-  {
-    "itemName": "Grass Block",
-    "position": 1,
-    "number": 1,
-    "stackSize": 64
-  },
-  {
-    "itemName": "Sapling",
-    "position": 2,
-    "number": 1,
-    "stackSize": 64
-  },
-  {
-    "itemName": "Sand",
-    "position": 3,
-    "number": 1,
-    "stackSize": 64
-  },
-  {
-    "itemName": "null",
-    "position": 4
-  },
-  {
-    "itemName": "null",
-    "position": 5
-  },
-  {
-    "itemName": "null",
-    "position": 6
-  },
-  {
-    "itemName": "null",
-    "position": 7
-  },
-  {
-    "itemName": "null",
-    "position": 8
-  },
-  {
-    "itemName": "null",
-    "position": 9
-  },
-  {
-    "itemName": "Bedrock",
-    "position": 10,
-    "number": 1,
-    "stackSize": 64
-  },
-  {
-    "itemName": "null",
-    "position": 11
-  },
-  {
-    "itemName": "null",
-    "position": 12
-  },
-  {
-    "itemName": "null",
-    "position": 13
-  },
-  {
-    "itemName": "null",
-    "position": 14
-  },
-  {
-    "itemName": "null",
-    "position": 15
-  },
-  {
-    "itemName": "null",
-    "position": 16
-  },
-  {
-    "itemName": "null",
-    "position": 17
-  },
-  {
-    "itemName": "null",
-    "position": 18
-  }
-]

Minecraft.Crafting.Api/Data/items-original.json

@@ -122,7 +122,7 @@
   {
     "id": 25,
     "displayName": "Note Block",
-    "name": "noteblock",
+    "name": "note_block",
     "stackSize": 64
   },
   {

Minecraft.Crafting.Api/Dockerfile

@@ -1,5 +1,3 @@
-#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
 WORKDIR /app
 EXPOSE 80
@@ -7,9 +5,9 @@ EXPOSE 443
 
 FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
 WORKDIR /src
-COPY ["Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj", "Minecraft.Crafting.Api/"]
+COPY ["src/Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj", "Minecraft.Crafting.Api/"]
 RUN dotnet restore "Minecraft.Crafting.Api/Minecraft.Crafting.Api.csproj"
-COPY . .
+COPY src/. .
 WORKDIR "/src/Minecraft.Crafting.Api"
 RUN dotnet build "Minecraft.Crafting.Api.csproj" -c Release -o /app/build