etc

CaranudLapin · Nov 17, 2023 · abf90f7 · abf90f7
1 parent f70a828
commit abf90f7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/FurnitureDisplayFramework/FurnitureDisplayFramework.csproj b/FurnitureDisplayFramework/FurnitureDisplayFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Version>1.0.0</Version>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 	<EnableHarmony>true</EnableHarmony>
 	<Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>

diff --git a/FurnitureDisplayFramework/FurnitureDisplayFrameworkAPI.cs b/FurnitureDisplayFramework/FurnitureDisplayFrameworkAPI.cs
@@ -31,10 +31,7 @@ public List<Object> GetSlotObjects(Furniture f)
             List<Object> list = new List<Object>();
             for(int i = 0; i < data.slots.Length; i++)
             {
-                if(f.modData.TryGetValue("aedenthorn.FurnitureDisplayFramework/" + i, out string slotString))
-                {
-                    list.Add(ModEntry.GetObjectFromSlot(slotString));
-                }
+                list.Add(ModEntry.GetObjectFromSlot(f.modData.TryGetValue("aedenthorn.FurnitureDisplayFramework/" + i, out string slotString) ? slotString : null));
             }
             return list;
         }

diff --git a/FurnitureDisplayFramework/Methods.cs b/FurnitureDisplayFramework/Methods.cs
@@ -1,5 +1,7 @@
 using Newtonsoft.Json.Serialization;
 using StardewValley;
+using System;
+using Object = StardewValley.Object;
 
 namespace FurnitureDisplayFramework
 {
@@ -22,17 +24,7 @@ private static void HandleSerializationError(object sender, ErrorEventArgs e)
 
         private static Object GetObjectFromID(string id, int amount, int quality)
         {
-            if (int.TryParse(id, out int index))
-            {
-                //SMonitor.Log($"Spawning object with index {id}");
-                return new Object(index, amount, false, -1, quality);
-            }
-            foreach (var kvp in Game1.objectInformation)
-            {
-                if (kvp.Value.StartsWith(id + "/"))
-                    return new Object(kvp.Key, amount, false, -1, quality);
-            }
-            return null;
+            return new Object(id, amount, false, -1, quality);
             /*
             //SMonitor.Log($"Trying to get object {id}, DGA {apiDGA != null}, JA {apiJA != null}");
 

diff --git a/FurnitureDisplayFramework/ModEntry.cs b/FurnitureDisplayFramework/ModEntry.cs
@@ -21,7 +21,6 @@ public partial class ModEntry : Mod
         public static ModConfig Config;
 
         public static ModEntry context;
-        private static IDynamicGameAssetsApi apiDGA;
         private static IJsonAssetsApi apiJA;
         public static Dictionary<string, FurnitureDisplayData> furnitureDisplayDict = new Dictionary<string, FurnitureDisplayData>();
         public static readonly string frameworkPath = "Mods/aedenthorn.FurnitureDisplayFramework/dictionary";

diff --git a/FurnitureDisplayFramework/manifest.json b/FurnitureDisplayFramework/manifest.json
@@ -1,7 +1,7 @@
 {
   "Name": "Furniture Display Framework",
   "Author": "aedenthorn",
-  "Version": "0.4.0",
+  "Version": "0.5.0",
   "Description": "FurnitureDisplayFramework.",
   "UniqueID": "aedenthorn.FurnitureDisplayFramework",
   "EntryDll": "FurnitureDisplayFramework.dll",