diff --git a/.gitignore b/.gitignore index bf24d17..05fc40f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .vs -packages -.vs/TreeShaker/v15/Server/sqlite3/storage.ide-shm -.vs/TreeShaker/v15/Server/sqlite3/storage.ide-shm +bin/ +obj/ diff --git a/TreeShaker/ModEntry.cs b/TreeShaker/ModEntry.cs index 36dfacf..2f7a586 100644 --- a/TreeShaker/ModEntry.cs +++ b/TreeShaker/ModEntry.cs @@ -35,29 +35,35 @@ private void DayStarted(object sender, DayStartedEventArgs e) foreach (KeyValuePair pair in location.terrainFeatures.Pairs) { Vector2 tile = pair.Key; - if (!(pair.Value is Tree tree)) - + var tree = pair.Value as Tree; + if (tree == null) + { + continue; + } + if (tree.growthStage.Value > Tree.seedStage && !tree.hasSeed.Value) + { continue; + } { bool added = false; switch (tree.treeType.Value) { - case 1: - Item a = chest.addItem(new SObject(309, 1)); + case "1": // oak + Item a = chest.addItem(new SObject("309", 1)); if (a == null) { added = true; } break; - case 2: - Item m = chest.addItem(new SObject(310, 1)); + case "2": // maple + Item m = chest.addItem(new SObject("310", 1)); if (m == null) { added = true; } break; - case 3: - Item p = chest.addItem(new SObject(311, 1)); + case "3": // pine + Item p = chest.addItem(new SObject("311", 1)); if (p == null) { added = true; diff --git a/TreeShaker/Properties/AssemblyInfo.cs b/TreeShaker/Properties/AssemblyInfo.cs deleted file mode 100644 index 05558c9..0000000 --- a/TreeShaker/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("TreeShaker")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TreeShaker")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("99a3315d-3650-48c8-ab6d-63574f83727c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/TreeShaker/TreeShaker.csproj b/TreeShaker/TreeShaker.csproj index 68d0885..07d6e99 100644 --- a/TreeShaker/TreeShaker.csproj +++ b/TreeShaker/TreeShaker.csproj @@ -1,79 +1,13 @@ - - - - - Debug - AnyCPU - {99A3315D-3650-48C8-AB6D-63574F83727C} - Library - Properties - TreeShaker - TreeShaker - v4.5 - 512 - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - x86 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + TreeShaker + TreeShaker + 1.0.0 + net6.0 + Latest + + + + + \ No newline at end of file diff --git a/TreeShaker/manifest.json b/TreeShaker/manifest.json index baed552..154c16d 100644 --- a/TreeShaker/manifest.json +++ b/TreeShaker/manifest.json @@ -1,10 +1,10 @@ { "Name": "TreeShaker", "Author": "Tyo Atrosa", - "Version": "0.0.61-unofficial.1-Mizzion", + "Version": "0.0.61-unofficial.2-huancz", "Description": "Automatically shakes seeds from your trees.", "UniqueID": "TyoAtrosa.Treeshaker", "EntryDll": "TreeShaker.dll", - "MinimumApiVersion": "2.10.2", + "MinimumApiVersion": "4.0.0", "UpdateKeys": ["GitHub: TyoAtrosa/TreeShaker"] } \ No newline at end of file diff --git a/TreeShaker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/TreeShaker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache deleted file mode 100644 index fc4e213..0000000 Binary files a/TreeShaker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and /dev/null differ