Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDV 1.6 update #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SDV 1.6 update #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.vs
packages
.vs/TreeShaker/v15/Server/sqlite3/storage.ide-shm
.vs/TreeShaker/v15/Server/sqlite3/storage.ide-shm
bin/
obj/
22 changes: 14 additions & 8 deletions TreeShaker/ModEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,35 @@ private void DayStarted(object sender, DayStartedEventArgs e)
foreach (KeyValuePair<Vector2, TerrainFeature> 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;
Expand Down
35 changes: 0 additions & 35 deletions TreeShaker/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

90 changes: 12 additions & 78 deletions TreeShaker/TreeShaker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{99A3315D-3650-48C8-AB6D-63574F83727C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TreeShaker</RootNamespace>
<AssemblyName>TreeShaker</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ModEntry.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="manifest.json" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>TreeShaker</AssemblyName>
<RootNamespace>TreeShaker</RootNamespace>
<Version>1.0.0</Version>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>Latest</LangVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="4.1.1" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions TreeShaker/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
}
Binary file removed TreeShaker/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View file
Open in desktop
Binary file not shown.