Skip to content

Commit

Permalink
Release 0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thomotron committed Jan 22, 2023
2 parents 90fd93c + 04bb062 commit 641c1e8
Show file tree
Hide file tree
Showing 42 changed files with 2,291 additions and 1,850 deletions.
4 changes: 4 additions & 0 deletions .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,14 @@ The client project depends on several assemblies from RimWorld's data directory
- `UnityEngine.dll`
- `UnityEngine.CoreModule.dll`
- `UnityEngine.IMGUIModule.dll`
- `UnityEngine.InputLegacyModule.dll`
- `UnityEngine.TextRenderingModule.dll`

All of these need to be present in the `GameDlls/` directory to build the client project. Either copy them in directly or make a symbolic link.

If building for multiple game versions, you can also create a directory for the version under `GameDlls/` and place that version's dependencies in there (e.g. `GameDlls/1.3/...`).
These will be preferred when building if they exist, otherwise the files in `GameDlls/` will be used.

If you only want to build the common projects and/or the server project, you can build the solution using the `TravisCI` build profile which does not require the game assemblies.

### Protobuf for Packet Compilation
Expand Down
6 changes: 6 additions & 0 deletions Client/Common/Languages/English/Keyed/English.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
<Phinix_hugslibsettings_allItemsTradable>Allow trading items that are not in storage</Phinix_hugslibsettings_allItemsTradable>
<Phinix_hugslibsettings_showBlockedTrades>Show trades from blocked users</Phinix_hugslibsettings_showBlockedTrades>
<Phinix_hugslibsettings_blockedUsers>Blocked users</Phinix_hugslibsettings_blockedUsers>
<Phinix_hugslibsettings_chatMessageLimit>Number of chat messages to keep</Phinix_hugslibsettings_chatMessageLimit>
<Phinix_hugsLibSettings_forceMessageFieldFocus>Keep focus on chat message text box</Phinix_hugsLibSettings_forceMessageFieldFocus>
<Phinix_hugsLibSettings_forceMessageFieldFocus_description>Keeps the chat message box selected until you click outside of it. Turn this off if you have trouble with other text boxes not being selected properly.</Phinix_hugsLibSettings_forceMessageFieldFocus_description>

<Phinix_login_logInLabel>Log in to</Phinix_login_logInLabel>
<Phinix_login_submitButton>Submit</Phinix_login_submitButton>
Expand All @@ -49,6 +52,8 @@
<Phinix_trade_cancelButton>Cancel</Phinix_trade_cancelButton>
<Phinix_trade_sortByLabel>Sort by</Phinix_trade_sortByLabel>
<Phinix_trade_searchLabel>Search</Phinix_trade_searchLabel>
<Phinix_trade_noItemsAvailable>You have no items available to trade.</Phinix_trade_noItemsAvailable>
<Phinix_trade_noItemsAvailableWithSearch>No items found that match the search criteria.</Phinix_trade_noItemsAvailableWithSearch>
<Phinix_trade_tradeReceivedLetter_label>Trade from {0}</Phinix_trade_tradeReceivedLetter_label>
<Phinix_trade_tradeReceivedLetter_description>{0} has sent you a trade offer.\n\nCheck the 'Trades' tab in the Phinix chat panel for details.</Phinix_trade_tradeReceivedLetter_description>
<Phinix_trade_tradeCompletedLetter_label>Trade successful</Phinix_trade_tradeCompletedLetter_label>
Expand All @@ -60,6 +65,7 @@
<Phinix_trade_activeTrade_theyHaveAccepted>They have accepted</Phinix_trade_activeTrade_theyHaveAccepted>
<Phinix_trade_activeTrade_theyHaveNotAccepted>They have not accepted</Phinix_trade_activeTrade_theyHaveNotAccepted>
<Phinix_trade_activeTrade_openButton>Open</Phinix_trade_activeTrade_openButton>
<Phinix_trade_activeTrade_cancelButton>Cancel</Phinix_trade_activeTrade_cancelButton>

<Phinix_error_loginFailedTitle>Login failed</Phinix_error_loginFailedTitle>
<Phinix_error_loginFailedMessage>Failed to log in to the server: {0} ({1})</Phinix_error_loginFailedMessage>
Expand Down
207 changes: 184 additions & 23 deletions Client/Source/Client.cs

Large diffs are not rendered by default.

63 changes: 45 additions & 18 deletions Client/Source/Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,32 @@
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<Choose>
<!-- Travis doesn't need a game version so substitute one in -->
<When Condition="!$(Configuration.Contains(' ')) Or '$(Configuration)' == 'TravisCI' ">
<PropertyGroup>
<GameVersion>Any</GameVersion>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<GameVersion>$(Configuration.Split(" ")[1])</GameVersion>
</PropertyGroup>
</Otherwise>
</Choose>
<Choose>
<When Condition="Exists('$(SolutionDir)\GameDlls\$(GameVersion)')">
<PropertyGroup>
<RimWorldDepDir>$(SolutionDir)\GameDlls\$(GameVersion)</RimWorldDepDir>
</PropertyGroup>
</When>
<Otherwise>
<PropertyGroup>
<RimWorldDepDir>$(SolutionDir)\GameDlls</RimWorldDepDir>
</PropertyGroup>
</Otherwise>
</Choose>
<PropertyGroup Condition=" $(Configuration.StartsWith('Debug')) And '$(Platform)' == 'AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
Expand All @@ -21,7 +46,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PropertyGroup Condition=" $(Configuration.StartsWith('Release')) And '$(Platform)' == 'AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
Expand All @@ -41,7 +66,7 @@
<HintPath>..\..\.nuget\Lib.Harmony.2.2.2\lib\net472\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\GameDlls\Assembly-CSharp.dll</HintPath>
<HintPath>$(RimWorldDepDir)\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="HugsLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\.nuget\UnlimitedHugs.Rimworld.HugsLib.10.0.1\lib\net472\HugsLib.dll</HintPath>
Expand All @@ -55,22 +80,26 @@
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine">
<HintPath>..\..\GameDlls\UnityEngine.dll</HintPath>
<HintPath>$(RimWorldDepDir)\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\GameDlls\UnityEngine.CoreModule.dll</HintPath>
<HintPath>$(RimWorldDepDir)\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\GameDlls\UnityEngine.IMGUIModule.dll</HintPath>
<HintPath>$(RimWorldDepDir)\UnityEngine.IMGUIModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.InputLegacyModule">
<HintPath>$(RimWorldDepDir)\UnityEngine.InputLegacyModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.TextRenderingModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\GameDlls\UnityEngine.TextRenderingModule.dll</HintPath>
<HintPath>$(RimWorldDepDir)\UnityEngine.TextRenderingModule.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="BlockedUsersChangedEventArgs.cs" />
<Compile Include="GUI\GUIUtils.cs" />
<Compile Include="UIChatMessage.cs" />
<Compile Include="Client.cs" />
<Compile Include="GUI\Basic Widgets\AdapterWidget.cs" />
<Compile Include="GUI\Basic Widgets\BlankWidget.cs" />
<Compile Include="GUI\Basic Widgets\ButtonWidget.cs" />
<Compile Include="GUI\Basic Widgets\CheckboxLabeledWidget.cs" />
Expand All @@ -81,26 +110,21 @@
<Compile Include="GUI\Basic Widgets\TextWidget.cs" />
<Compile Include="GUI\Basic Widgets\ThingIconWidget.cs" />
<Compile Include="GUI\Compound Widgets\ChatMessageList.cs" />
<Compile Include="GUI\Compound Widgets\ChatMessageWidget.cs" />
<Compile Include="GUI\Compound Widgets\DynamicTextWidget.cs" />
<Compile Include="GUI\Compound Widgets\ItemStackRow.cs" />
<Compile Include="GUI\Compound Widgets\TradeList.cs" />
<Compile Include="GUI\Compound Widgets\TradeRow.cs" />
<Compile Include="GUI\Compound Widgets\UserList.cs" />
<Compile Include="GUI\Compound Widgets\UserWidget.cs" />
<Compile Include="GUI\Containers\ConditionalContainer.cs" />
<Compile Include="GUI\Containers\Container.cs" />
<Compile Include="GUI\Containers\HeightContainer.cs" />
<Compile Include="GUI\Containers\HorizontalFlexContainer.cs" />
<Compile Include="GUI\Containers\HorizontalPaddedContainer.cs" />
<Compile Include="GUI\Containers\HorizontalScrollContainer.cs" />
<Compile Include="GUI\Containers\MinimumContainer.cs" />
<Compile Include="GUI\Containers\VerticalScrollContainer.cs" />
<Compile Include="GUI\Containers\TabContainerEntry.cs" />
<Compile Include="GUI\Containers\TabsContainer.cs" />
<Compile Include="GUI\Containers\VerticalFlexContainer.cs" />
<Compile Include="GUI\Containers\VerticalPaddedContainer.cs" />
<Compile Include="GUI\Containers\WidthContainer.cs" />
<Compile Include="GUI\Displayable.cs" />
<Compile Include="GUI\Windows and panels\CredentialsWindow.cs" />
<Compile Include="GUI\Windows and panels\ServerTab.cs" />
Expand All @@ -112,6 +136,11 @@
<Compile Include="StackedThings.cs" />
<Compile Include="ListSetting.cs" />
<Compile Include="TradingThingConverter.cs" />
<Compile Include="UIChatMessageEventArgs.cs" />
<Compile Include="UICompleteTradeEventArgs.cs" />
<Compile Include="UICreateTradeEventArgs.cs" />
<Compile Include="UITradesSyncedEventArgs.cs" />
<Compile Include="UITradeUpdateEventArgs.cs" />
<Compile Include="UnknownItem.cs" />
<Content Include="..\About\**">
<Link>About\%(RecursiveDir)%(Filename)%(Extension)</Link>
Expand Down Expand Up @@ -159,8 +188,7 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="Clean">
<RemoveDir Directories="$(SolutionDir)\Client\Common\Assemblies\" />
<RemoveDir Directories="$(SolutionDir)\Client\1.3\Assemblies\" />
<RemoveDir Directories="$(SolutionDir)\Client\1.4\Assemblies\" />
<RemoveDir Directories="$(SolutionDir)\Client\$(GameVersion)\Assemblies\" />
</Target>
<Target Name="AfterBuild">
<Copy SourceFiles="$(TargetDir)\LiteNetLib.dll" DestinationFiles="$(SolutionDir)\Client\Common\Assemblies\1-LiteNetLib.dll" />
Expand All @@ -171,7 +199,6 @@
<Copy SourceFiles="$(TargetDir)\UserManagement.dll" DestinationFiles="$(SolutionDir)\Client\Common\Assemblies\6-UserManagement.dll" />
<Copy SourceFiles="$(TargetDir)\Chat.dll" DestinationFiles="$(SolutionDir)\Client\Common\Assemblies\7-Chat.dll" />
<Copy SourceFiles="$(TargetDir)\Trading.dll" DestinationFiles="$(SolutionDir)\Client\Common\Assemblies\8-Trading.dll" />
<Copy SourceFiles="$(TargetDir)\PhinixClient.dll" DestinationFiles="$(SolutionDir)\Client\1.3\Assemblies\9-PhinixClient.dll" />
<Copy SourceFiles="$(TargetDir)\PhinixClient.dll" DestinationFiles="$(SolutionDir)\Client\1.4\Assemblies\9-PhinixClient.dll" />
<Copy SourceFiles="$(TargetDir)\PhinixClient.dll" DestinationFiles="$(SolutionDir)\Client\$(GameVersion)\Assemblies\9-PhinixClient.dll" />
</Target>
</Project>
</Project>
71 changes: 0 additions & 71 deletions Client/Source/GUI/Basic Widgets/AdapterWidget.cs

This file was deleted.

Loading

0 comments on commit 641c1e8

Please sign in to comment.