Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Entoarox/StardewMods.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@Entoarox
Entoarox committed Jul 2, 2019
2 parents babdd1d + c23e999 commit ed8092b
Show file tree
Hide file tree
Showing 65 changed files with 536 additions and 2,162 deletions.
105 changes: 13 additions & 92 deletions AdvancedLocationLoader/AdvancedLocationLoader.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,102 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" 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)' == '' ">x86</Platform>
<ProjectGuid>{9EA06249-2096-43E0-B616-DDD3FE731147}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Entoarox.AdvancedLocationLoader</RootNamespace>
<AssemblyName>AdvancedLocationLoader</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<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>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<LangVersion>7.1</LangVersion>
<RootNamespace>Entoarox.AdvancedLocationLoader</RootNamespace>
<Version>1.5.0</Version>
<TargetFramework>net452</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="2.2.0" />
</ItemGroup>
<ItemGroup>
<Reference Include="StardewModdingAPI.Toolkit.CoreInterfaces, Version=2.10.2.0, Culture=neutral, PublicKeyToken=null" />
<Reference Include="System" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Actions.cs" />
<Compile Include="ConditionalResolver.cs" />
<Compile Include="Configs\Compound.cs" />
<Compile Include="Configs\LoaderVersionConfig.cs" />
<Compile Include="Configs\Subclasses\Property.cs" />
<Compile Include="Configs\Subclasses\Redirect.cs" />
<Compile Include="Configs\Subclasses\Override.cs" />
<Compile Include="Configs\Subclasses\Location.cs" />
<Compile Include="Configs\LocationConfig_1_1.cs" />
<Compile Include="Configs\LocationConfig1_2.cs" />
<Compile Include="Configs\Subclasses\MapFileLink.cs" />
<Compile Include="Configs\ShopConfig.cs" />
<Compile Include="Configs\Subclasses\ShopItem.cs" />
<Compile Include="Configs\Subclasses\Conditional.cs" />
<Compile Include="Configs\ContentPackData.cs" />
<Compile Include="Configs\Subclasses\TileInfo.cs" />
<Compile Include="Configs\Subclasses\TeleporterDestination.cs" />
<Compile Include="Configs\Subclasses\TeleporterList.cs" />
<Compile Include="Configs\Subclasses\Tilesheet.cs" />
<Compile Include="Configs\Subclasses\Tile.cs" />
<Compile Include="Configs\Subclasses\Warp.cs" />
<Compile Include="ContentPackExtensions.cs" />
<Compile Include="Processing\ConfigReader.cs" />
<Compile Include="Processing\Patcher.cs" />
<Compile Include="Locations\DecoratableLocation.cs" />
<Compile Include="Locations\Desert.cs" />
<Compile Include="Locations\Greenhouse.cs" />
<Compile Include="Locations\Sewer.cs" />
<Compile Include="Menus\CarpenterMenu.cs" />
<Compile Include="ModEntry.cs" />
<Compile Include="Processors.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="StructuredBinaryFile.cs" />
<Compile Include="TeleportationResolver.cs" />
</ItemGroup>
<ItemGroup>
<None Include="docs\actions.md" />
<None Include="i18n\de.json" />
<None Include="i18n\default.json" />
<None Include="manifest.json" />
<None Include="README.md" />
<None Include="RELEASE-NOTES.md" />
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0-beta.5" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Framework\EntoaroxFramework.csproj">
<Project>{174275e7-3ae4-41a6-9884-9e08a07d1101}</Project>
<Name>EntoaroxFramework</Name>
<Private>False</Private>
<Private>false</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="docs\manifest.md" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

<Import Project="$(SolutionDir)\common.targets" />

</Project>
16 changes: 12 additions & 4 deletions AdvancedLocationLoader/ModEntry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

namespace Entoarox.AdvancedLocationLoader
{
/// <summary>The mod entry class.</summary>
internal class ModEntry : Mod
{
/*********
Expand Down Expand Up @@ -46,6 +47,7 @@ public override void Entry(IModHelper helper)
ModEntry.Strings = helper.Translation;

MoreEvents.ActionTriggered += this.OnActionTriggered;
helper.Events.GameLoop.GameLaunched += this.OnGameLaunched;
helper.Events.Specialised.UnvalidatedUpdateTicked += this.OnUnvalidatedUpdateTick;
helper.Events.Player.Warped += this.OnWarped;
helper.Events.Player.Warped += this.DrawFarBack;
Expand All @@ -54,10 +56,6 @@ public override void Entry(IModHelper helper)
this.Helper.Content.RegisterSerializerType<Sewer>();
this.Helper.Content.RegisterSerializerType<Desert>();
this.Helper.Content.RegisterSerializerType<DecoratableLocation>();

// load content packs
ContentPackData[] contentPacks = this.LoadContentPackData().ToArray();
this.Patcher = new Patcher(this.Monitor, this.Helper.Content, contentPacks);
}

internal static void UpdateConditionalEdits()
Expand Down Expand Up @@ -97,6 +95,16 @@ internal static void UpdateTilesheets()
/*********
** Private methods
*********/
/// <summary>Raised after the game is launched, right before the first update tick. This happens once per game session (unrelated to loading saves). All mods are loaded and initialised at this point, so this is a good time to set up mod integrations.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event data.</param>
private void OnGameLaunched(object sender, GameLaunchedEventArgs e)
{
// load content packs
ContentPackData[] contentPacks = this.LoadContentPackData().ToArray();
this.Patcher = new Patcher(this.Monitor, this.Helper.Content, contentPacks);
}

/// <summary>Load the data from each available content pack.</summary>
private IEnumerable<ContentPackData> LoadContentPackData()
{
Expand Down
6 changes: 0 additions & 6 deletions AdvancedLocationLoader/Properties/AssemblyInfo.cs
View file

This file was deleted.

27 changes: 20 additions & 7 deletions AdvancedLocationLoader2/ALLModEntry.cs
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

using StardewModdingAPI;
using StardewModdingAPI.Events;

namespace Entoarox.AdvancedLocationLoader2
{
/// <summary>The mod entry class.</summary>
public class ALLModEntry : Mod
{
/*********
** Public methods
*********/
/// <summary>The mod entry point, called after the mod is first loaded.</summary>
/// <param name="helper">Provides simplified APIs for writing mods.</param>
public override void Entry(IModHelper helper)
{
helper.Events.GameLoop.GameLaunched += this.OnGameLaunched;
}


/*********
** Private methods
*********/
/// <summary>Raised after the game is launched, right before the first update tick. This happens once per game session (unrelated to loading saves). All mods are loaded and initialised at this point, so this is a good time to set up mod integrations.</summary>
/// <param name="sender">The event sender.</param>
/// <param name="e">The event data.</param>
private void OnGameLaunched(object sender, GameLaunchedEventArgs e)
{
this.LoadContent();
}

private void LoadContent()
{
foreach(var pack in this.Helper.ContentPacks.GetOwned())
foreach (var pack in this.Helper.ContentPacks.GetOwned())
{

}
Expand Down
85 changes: 16 additions & 69 deletions AdvancedLocationLoader2/AdvancedLocationLoader2.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,23 @@
<?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>{3E6083A5-7122-4E40-B720-D4436CD816B5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Entoarox.AdvancedLocationLoader2</RootNamespace>
<AssemblyName>AdvancedLocationLoader2</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<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>
</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>
<RootNamespace>Entoarox.AdvancedLocationLoader2</RootNamespace>
<Version>1.5.0</Version>
<TargetFramework>net452</TargetFramework>
</PropertyGroup>

<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<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="ALLModEntry.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Structure\Version1\ContentPack.cs" />
<Compile Include="Structure\Version1\Location.cs" />
<Compile Include="Structure\Version1\MapFileLink.cs" />
<Compile Include="Structure\Version1\Patch.cs" />
<Compile Include="Structure\Version1\Shop.cs" />
<Compile Include="Structure\Version1\ShopItem.cs" />
<Compile Include="Structure\Version1\TileEdit.cs" />
<Compile Include="Structure\Version1\Tilesheet.cs" />
<Compile Include="Structure\Version1\Warp.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Pathoschild.Stardew.ModBuildConfig" Version="3.0.0-beta.5" />
</ItemGroup>

<ItemGroup>
<Analyzer Include="..\packages\Pathoschild.Stardew.ModBuildConfig.2.2.0\analyzers\dotnet\cs\StardewModdingAPI.ModBuildConfig.Analyzer.dll" />
<ProjectReference Include="..\Framework\EntoaroxFramework.csproj">
<Private>false</Private>
</ProjectReference>
</ItemGroup>
<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>

<Import Project="$(SolutionDir)\common.targets" />

</Project>
36 changes: 0 additions & 36 deletions AdvancedLocationLoader2/Properties/AssemblyInfo.cs
View file

This file was deleted.

5 changes: 0 additions & 5 deletions AdvancedLocationLoader2/packages.config
View file

This file was deleted.

Loading

0 comments on commit ed8092b

Please sign in to comment.