Skip to content

[BetterCrafting] Also set CraftingRecipe field (if possible) for SpaceCore recipes (fix YACS integration) #34

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
zombifier wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[BetterCrafting] Also set CraftingRecipe field (if possible) for SpaceCore recipes (fix YACS integration) #34

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
8 changes: 7 additions & 1 deletion BetterCrafting/Integrations/SpaceCore/SCRecipe.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ public SCRecipe(string name, ICustomCraftingRecipe recipe, bool cooking, IEnumer
string? test = recipe.Description;
Texture2D testtwo = recipe.IconTexture;
Rectangle? testthree = recipe.IconSubrect;

if (Cooking ?
CraftingRecipe.cookingRecipes.ContainsKey(name) :
CraftingRecipe.craftingRecipes.ContainsKey(name)) {
this.CraftingRecipe = new CraftingRecipe(name, Cooking);
}
}

#region Identity
Expand All @@ -67,7 +73,7 @@ public virtual int GetTimesCrafted(Farmer who) {
return 0;
}

public CraftingRecipe? CraftingRecipe => null;
public CraftingRecipe? CraftingRecipe { get; }

#endregion

Expand Down
24 changes: 12 additions & 12 deletions Common/Common.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
Expand All @@ -15,9 +15,9 @@
<Compile Include="$(MSBuildThisFileDirectory)DynamicRecipeSpriteInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Crafting\IRecyclable.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Events\ConsoleCommand.cs" />
<Compile Include="$(MSBuildThisFileDirectory)events\GSQCondition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Events\GSQCondition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Events\PintailModSubscriber.cs" />
<Compile Include="$(MSBuildThisFileDirectory)events\TriggerAction.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Events\TriggerAction.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions\EventExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions\NameValueCollectionExtensions.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Extensions\RandomExtensions.cs" />
Expand All @@ -26,16 +26,16 @@
<Compile Include="$(MSBuildThisFileDirectory)Inventory\BuildingProvider.cs" />
<Compile Include="$(MSBuildThisFileDirectory)MultipleEventedInventoryExclusiveRequest.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ReflectionHelper.cs" />
<Compile Include="$(MSBuildThisFileDirectory)serialization\AbstractConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Serialization\AbstractConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Serialization\Converters\DiscriminatingConverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SmokedFishSpriteInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)TextureColorWatcher.cs" />
<Compile Include="$(MSBuildThisFileDirectory)types\ModAssetEditor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)types\ValueEqualityDictionary.cs" />
<Compile Include="$(MSBuildThisFileDirectory)types\ValueEqualityList.cs" />
<Compile Include="$(MSBuildThisFileDirectory)types\ValueStringBuilder.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ui\simplelayout\AttachmentSlotsNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ui\simplelayout\DynamicDrawingNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Types\ModAssetEditor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Types\ValueEqualityDictionary.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Types\ValueEqualityList.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Types\ValueStringBuilder.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\SimpleLayout\AttachmentSlotsNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\SimpleLayout\DynamicDrawingNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)SpookyActionAtADistance.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Types\AbsolutePosition.cs" />
<Compile Include="$(MSBuildThisFileDirectory)CombinedRingSpriteInfo.cs" />
Expand Down Expand Up @@ -63,7 +63,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\KMargins.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\KSize.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\SimpleLayout\ComponentSNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)ui\simplelayout\EmptyNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\SimpleLayout\EmptyNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\Widgets\IKLayoutItem.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\Widgets\KLayout.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\Widgets\KObject.cs" />
Expand Down Expand Up @@ -125,4 +125,4 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\SimpleLayout\ISimpleNode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\FlowNode\IFlowNode.cs" />
</ItemGroup>
</Project>
</Project>