Skip to content

Updated to 1.5.5 beta + Grammar fixes #194

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

Open
overwritten wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Updated to 1.5.5 beta + Grammar fixes #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64e45a5
Update to SDV 1.5.5 beta and did a bunch of grammar fixes
overwritten Nov 28, 2021
909964f
Update AnimalHusbandryModEntry.cs
overwritten Nov 28, 2021
f5935db
SIGH...
overwritten Nov 28, 2021
daca71f
Merge branch 'master' into master
overwritten Jan 31, 2022
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
87 changes: 15 additions & 72 deletions ButcherMod/AnimalHusbandryMod.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Version>1.0.0</Version>
<TargetFramework>net5.0</TargetFramework>
<EnableHarmony>true</EnableHarmony>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{FA6A5BA1-8983-4982-B746-ADF42EC01795}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AnimalHusbandryMod</RootNamespace>
<AssemblyName>AnimalHusbandryMod</AssemblyName>
<FileAlignment>512</FileAlignment>
</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>
<None Include="contentPackTemplate\customAnimals.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="contentPackTemplate\manifest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="i18n\pt.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="i18n\default.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="manifest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MailFrameworkMod\MailFrameworkMod.csproj">
<Project>{9ab101dd-fb56-4441-8180-783405d2d2f0}</Project>
<Name>MailFrameworkMod</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="common\CustomLetterBG.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="common\LooseSprites.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="tools\MenuTiles.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="tools\Tools.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
</Project>
<PropertyGroup>
<AssemblyName>AnimalHusbandryMod</AssemblyName>
<RootNamespace>AnimalHusbandryMod</RootNamespace>
<Version>1.0.0</Version>
<TargetFramework>net5</TargetFramework>
<EnableHarmony>true</EnableHarmony>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="4.0.0-beta.20210916" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\MailFrameworkMod\MailFrameworkMod.csproj" />
</ItemGroup>
14 changes: 7 additions & 7 deletions ButcherMod/AnimalHusbandryModEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ private void OnGameLaunched(object sender, GameLaunchedEventArgs args)
if (this.Helper.ModRegistry.IsLoaded("DIGUS.BUTCHER"))
{
Monitor.Log("Animal Husbandry Mod can't run along side its older version, ButcherMod. " +
"You need to copy the 'data' directory from the ButcherMod directory, into the AnimalHusbandryMod directory, then delete the ButcherMod directory. " +
"You need to copy the 'data' directory from the ButcherMod directory into the AnimalHusbandryMod directory, then delete the ButcherMod directory. " +
"Animal Husbandry Mod won't load until this is done.", LogLevel.Error);
_isEnabled = false;
}
Expand Down Expand Up @@ -92,18 +92,18 @@ private void OnGameLaunched(object sender, GameLaunchedEventArgs args)

if (!DataLoader.ModConfig.DisableTreats)
{
ModHelper.ConsoleCommands.Add("player_addfeedingbasket", "Add Feeding Basket to inventory.", (n, d) => Game1.player.addItemToInventory(ToolsFactory.GetFeedingBasket()));
ModHelper.ConsoleCommands.Add("player_addfeedingbasket", "Adds Feeding Basket to inventory.", (n, d) => Game1.player.addItemToInventory(ToolsFactory.GetFeedingBasket()));
}

if (!DataLoader.ModConfig.DisableAnimalContest)
{
ModHelper.ConsoleCommands.Add("player_addparticipantribbon", "Add Participant Ribbon to inventory.", (n, d) => Game1.player.addItemToInventory(ToolsFactory.GetParticipantRibbon()));
ModHelper.ConsoleCommands.Add("player_addparticipantribbon", "Adds Participant Ribbon to inventory.", (n, d) => Game1.player.addItemToInventory(ToolsFactory.GetParticipantRibbon()));
}

ModHelper.ConsoleCommands.Add("config_create_customanimaltemplates", "Add custom animal templates in the data\\animal.json file for every loaded custom animal.", DataLoader.AddCustomAnimalsTemplateCommand);
ModHelper.ConsoleCommands.Add("config_reload_contentpacks_animalhusbandrymod", "Reload all content packs for animal husbandry mod.",DataLoader.LoadContentPacksCommand);
ModHelper.ConsoleCommands.Add("world_removealltools_animalhusbandrymod", "Remove all custom tools added by the animal husbandry mod.",DataLoader.ToolsLoader.RemoveAllToolsCommand);
ModHelper.ConsoleCommands.Add("world_makepetvisible", "Force the pet to become visible, in case your pet doesn't reaper after the animal contest.", (n, d) => Game1.player.getPet().IsInvisible = false);
ModHelper.ConsoleCommands.Add("config_create_customanimaltemplates", "Adds custom animal templates in the data\\animal.json file for every loaded custom animal.", DataLoader.AddCustomAnimalsTemplateCommand);
ModHelper.ConsoleCommands.Add("config_reload_contentpacks_animalhusbandrymod", "Reloads all content packs for Animal Husbandry mod.",DataLoader.LoadContentPacksCommand);
ModHelper.ConsoleCommands.Add("world_removealltools_animalhusbandrymod", "Removes all custom tools added by the Animal Husbandry mod.",DataLoader.ToolsLoader.RemoveAllToolsCommand);
ModHelper.ConsoleCommands.Add("world_makepetvisible", "Forces the pet to become visible, in case your pet doesn't reappear after the animal contest.", (n, d) => Game1.player.getPet().IsInvisible = false);

if (DataLoader.ModConfig.AddMeatCleaverToInventoryKey != null || DataLoader.ModConfig.AddInseminationSyringeToInventoryKey != null || DataLoader.ModConfig.AddFeedingBasketToInventoryKey != null)
{
Expand Down
Loading