Skip to content

Commit

Permalink
etc
Browse files Browse the repository at this point in the history
  • Loading branch information
aedenthorn committed Oct 7, 2021
1 parent 4dcb598 commit 4b41dd7
Show file tree
Hide file tree
Showing 165 changed files with 490 additions and 960 deletions.
4 changes: 2 additions & 2 deletions AdvancedLootFramework/AdvancedLootFramework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\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.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion AdvancedLootFramework/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="3.3.0" targetFramework="net452" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="4.0.0-beta.20210916" targetFramework="net452" />
</packages>
4 changes: 2 additions & 2 deletions AdvancedMeleeFramework/AdvancedMeleeFramework.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\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.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion AdvancedMeleeFramework/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="3.3.0" targetFramework="net452" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="4.0.0-beta.20210916" targetFramework="net452" />
</packages>
4 changes: 2 additions & 2 deletions BiggerMineFloors/BiggerMineFloors.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\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.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion BiggerMineFloors/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="3.3.0" targetFramework="net452" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="4.0.0-beta.20210916" targetFramework="net452" />
</packages>
4 changes: 2 additions & 2 deletions BossCreatures/BossCreatures.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\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.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion BossCreatures/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="3.3.0" targetFramework="net452" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="4.0.0-beta.20210916" targetFramework="net452" />
</packages>
4 changes: 2 additions & 2 deletions CustomChestTypes/CustomChestTypes.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\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.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
<Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.4.0.0-beta.20210916\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion CustomChestTypes/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Pathoschild.Stardew.ModBuildConfig" version="3.3.0" targetFramework="net452" />
<package id="Pathoschild.Stardew.ModBuildConfig" version="4.0.0-beta.20210916" targetFramework="net452" />
</packages>
24 changes: 12 additions & 12 deletions CustomDecorationAreas/CodePatches.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ internal class CodePatches

public static void getFloors_Postfix(DecoratableLocation __instance, ref List<Rectangle> __result)
{
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.name))
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.Name))
return;
FloorWallData data = ModEntry.floorsWallsDataDict[__instance.name];
FloorWallData data = ModEntry.floorsWallsDataDict[__instance.Name];
if (data.getFloorsFromFile?.Length > 0)
data.floors = ModEntry.PHelper.Content.Load<List<Rectangle>>(data.getFloorsFromFile, ContentSource.GameContent);
if (data.replaceFloors)
Expand All @@ -30,9 +30,9 @@ public static void getFloors_Postfix(DecoratableLocation __instance, ref List<Re

public static void getWalls_Postfix(DecoratableLocation __instance, ref List<Rectangle> __result)
{
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.name))
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.Name))
return;
FloorWallData data = ModEntry.floorsWallsDataDict[__instance.name];
FloorWallData data = ModEntry.floorsWallsDataDict[__instance.Name];
if (data.getWallsFromFile?.Length > 0)
data.walls = ModEntry.PHelper.Content.Load<List<Rectangle>>(data.getWallsFromFile, ContentSource.GameContent);
if (data.replaceWalls)
Expand All @@ -46,11 +46,11 @@ public static void loadForNewGame_Postfix()
return;
for(int i = Game1.locations.Count - 1; i>= 0; i--)
{
if (Game1.locations[i].GetType() == typeof(GameLocation) && ModEntry.floorsWallsDataDict.ContainsKey(Game1.locations[i].name))
if (Game1.locations[i].GetType() == typeof(GameLocation) && ModEntry.floorsWallsDataDict.ContainsKey(Game1.locations[i].Name))
{
GameLocation gl = Game1.locations[i];
ModEntry.PMonitor.Log($"Converting {gl.name} to decoratable");
DecoratableLocation dl = new DecoratableLocation(gl.mapPath, gl.name);
DecoratableLocation dl = new DecoratableLocation(gl.mapPath.Value, gl.Name);
if (dl.map.GetTileSheet("walls_and_floors") == null)
{
Texture2D tex = ModEntry.PHelper.Content.Load<Texture2D>($"Maps/walls_and_floors", ContentSource.GameContent);
Expand All @@ -64,22 +64,22 @@ public static void loadForNewGame_Postfix()
for (int j = gl.characters.Count - 1; j >= 0; j--)
{
NPC npc = gl.characters[j];
NPC newNPC = new NPC(new AnimatedSprite(npc.sprite.Value.textureName.Value, npc.sprite.Value.currentFrame, npc.sprite.Value.spriteWidth, npc.sprite.Value.SpriteHeight), ModEntry.PHelper.Reflection.GetField<NetVector2>(npc, "defaultPosition").GetValue().Value, Game1.locations[i].name, ModEntry.PHelper.Reflection.GetField<int>(npc, "defaultFacingDirection").GetValue(), npc.Name, npc.datable.Value, null, Game1.content.Load<Texture2D>($"Portraits\\{npc.Name}"));
ModEntry.PMonitor.Log($"Adding {newNPC.name}, sprite {newNPC.sprite.Value.textureName.Value}");
NPC newNPC = new NPC(new AnimatedSprite(npc.sprite.Value.textureName.Value, npc.sprite.Value.currentFrame, npc.sprite.Value.SpriteWidth, npc.sprite.Value.SpriteHeight), ModEntry.PHelper.Reflection.GetField<NetVector2>(npc, "defaultPosition").GetValue().Value, Game1.locations[i].Name, ModEntry.PHelper.Reflection.GetField<int>(npc, "defaultFacingDirection").GetValue(), npc.Name, npc.datable.Value, null, Game1.content.Load<Texture2D>($"Portraits\\{npc.Name}"));
ModEntry.PMonitor.Log($"Adding {newNPC.Name}, sprite {newNPC.Sprite.textureName.Value}");
Game1.locations[Game1.locations.Count - 1].addCharacter(newNPC);
}
}
foreach (Vector2 key in gl.objects.Keys)
dl.objects.Add(key, gl.objects[key]);

ModEntry.convertedLocations.Add(dl.name);
ModEntry.convertedLocations.Add(dl.Name);
}
}
}

public static bool doSetVisibleFloor_Prefix(DecoratableLocation __instance, int whichRoom, int which)
{
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.name))
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.Name))
return true;

int idx = -1;
Expand Down Expand Up @@ -162,7 +162,7 @@ public static bool doSetVisibleFloor_Prefix(DecoratableLocation __instance, int
}
public static bool doSetVisibleWallpaper_Prefix(DecoratableLocation __instance, int whichRoom, int which)
{
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.name))
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.Name))
return true;

int idx = -1;
Expand Down Expand Up @@ -313,7 +313,7 @@ public static bool IsFloorableTile(int x, int y, string layer, DecoratableLocati

public static bool IsFloorableOrWallpaperableTile_Prefix(DecoratableLocation __instance, ref bool __result, int x, int y, string layer_name)
{
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.name))
if (!ModEntry.config.EnableMod || !ModEntry.floorsWallsDataDict.ContainsKey(__instance.Name))
return true;
__result = IsFloorableOrWallpaperableTile(x, y, layer_name, __instance);
return false;
Expand Down
71 changes: 6 additions & 65 deletions CustomDecorationAreas/CustomDecorationAreas.csproj
Original file line number Diff line number Diff line change
@@ -1,70 +1,11 @@
<?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')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D505B178-43FC-4BA9-9DC8-F1C494BAC0AA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CustomDecorationAreas</RootNamespace>
<AssemblyName>CustomDecorationAreas</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<EnableHarmony>true</EnableHarmony>
<Version>1.0.0</Version>
<TargetFramework>net5.0</TargetFramework>
<EnableHarmony>true</EnableHarmony>
</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>
</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>
<ItemGroup>
<Reference Include="Microsoft.Build" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Web.Extensions" />
<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="CodePatches.cs" />
<Compile Include="FloorWallDataDict.cs" />
<Compile Include="ModConfig.cs" />
<Compile Include="ModEntry.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>

<ItemGroup>
<None Include="manifest.json" />
<None Include="packages.config" />
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="4.0.0-beta.20210916" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.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.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.3.3.0\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
</Target>
</Project>
Loading

0 comments on commit 4b41dd7

Please sign in to comment.