Skip to content

Commit 89254d1

Browse files
pardeikepardeike
committed
v1.3 supports RimWorld 1.5
1 parent bcbb00f commit 89254d1

10 files changed

+148
-71
lines changed

‎0Harmony.dll

-783 KB
Binary file not shown.

‎1.5/Assemblies/CrossPromotion.dll

58.5 KB
Binary file not shown.

‎1.5/Assemblies/VisualExceptions.dll

54 KB
Binary file not shown.

‎1.5/Assemblies/com.rlabrecque.steamworks.net.dll

366 KB
Binary file not shown.

‎About/About.xml

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<ModMetaData>
3-
<name>Visual Exceptions</name>
4-
<author>Andreas Pardeike</author>
5-
<supportedVersions>
6-
<li>1.2</li>
7-
<li>1.3</li>
8-
<li>1.4</li>
9-
</supportedVersions>
10-
<modDependencies>
11-
<li>
12-
<packageId>brrainz.harmony</packageId>
13-
<displayName>Harmony</displayName>
14-
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
15-
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
16-
</li>
17-
</modDependencies>
18-
<loadBefore>
19-
<li>Ludeon.RimWorld</li>
20-
</loadBefore>
21-
<loadAfter>
22-
<li>brrainz.harmony</li>
23-
</loadAfter>
24-
<packageId>brrainz.visualexceptions</packageId>
25-
<url>https://github.com/pardeike/VisualExceptions</url>
26-
<description>A tool to display exceptions in a graphical way with all involved mods visualized</description>
27-
</ModMetaData>
3+
<name>Visual Exceptions</name>
4+
<author>Andreas Pardeike</author>
5+
<supportedVersions>
6+
<li>1.2</li>
7+
<li>1.3</li>
8+
<li>1.4</li>
9+
<li>1.5</li>
10+
</supportedVersions>
11+
<modDependencies>
12+
<li>
13+
<packageId>brrainz.harmony</packageId>
14+
<displayName>Harmony</displayName>
15+
<steamWorkshopUrl>steam://url/CommunityFilePage/2009463077</steamWorkshopUrl>
16+
<downloadUrl>https://github.com/pardeike/HarmonyRimWorld/releases/latest</downloadUrl>
17+
</li>
18+
</modDependencies>
19+
<loadBefore>
20+
<li>Ludeon.RimWorld</li>
21+
</loadBefore>
22+
<loadAfter>
23+
<li>brrainz.harmony</li>
24+
</loadAfter>
25+
<packageId>brrainz.visualexceptions</packageId>
26+
<modVersion>1.3.0.0</modVersion>
27+
<steamAppId>2538411704</steamAppId>
28+
<url>https://github.com/pardeike/VisualExceptions</url>
29+
<description>A tool to display exceptions in a graphical way with all involved mods visualized</description>
30+
</ModMetaData>

‎About/Manifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<Manifest>
33
<identifier>net.pardeike.rimworld.mod.visualexceptions</identifier>
4-
<version>1.2.1.0</version>
4+
<version>1.3.0.0</version>
55
<targetVersions>
66
<li>1.2.0</li>
77
<li>1.3.0</li>
88
<li>1.4.0</li>
9+
<li>1.5.0</li>
910
</targetVersions>
1011
<dependencies>
1112
</dependencies>

‎Directory.Build.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<ModName>Visual Exceptions</ModName>
5+
<ModFileName>VisualExceptions</ModFileName>
6+
<Repository>https://github.com/pardeike/VisualExceptions</Repository>
7+
<ModVersion>1.3.0.0</ModVersion>
8+
<ProjectGuid>{B0D46BB5-08FF-4E04-9EFD-3E32E38A9CC2}</ProjectGuid>
9+
</PropertyGroup>
10+
11+
</Project>

‎LoadFolders.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@
1111
<li>/</li>
1212
<li>1.4</li>
1313
</v1.4>
14+
<v1.5>
15+
<li>/</li>
16+
<li>1.5</li>
17+
</v1.5>
1418
</loadFolders>

‎Source/Assets.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ static Texture2D LoadTexture(string name, bool makeReadonly = true)
3232
var data = File.ReadAllBytes(fullPath);
3333
if (data == null || data.Length == 0) return new Texture2D(1, 1);
3434
var tex = new Texture2D(2, 2, TextureFormat.RGBA32, false, true);
35-
if (tex.LoadImage(data) == false) return new Texture2D(1, 1);
35+
tex.LoadRawTextureData(data);
3636
tex.Compress(true);
3737
tex.wrapMode = TextureWrapMode.Clamp;
3838
tex.filterMode = FilterMode.Trilinear;

‎Source/VisualExceptions.csproj

Lines changed: 101 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<ProjectGuid>{B0D46BB5-08FF-4E04-9EFD-3E32E38A9CC2}</ProjectGuid>
5-
<RootNamespace>VisualExceptions</RootNamespace>
6-
<AssemblyName>VisualExceptions</AssemblyName>
4+
<RootNamespace>$(ModFileName)</RootNamespace>
5+
<AssemblyName>$(ModFileName)</AssemblyName>
76
<TargetFramework>net472</TargetFramework>
8-
<LangVersion>8.0</LangVersion>
7+
<LangVersion>latest</LangVersion>
98
<PlatformTarget>x64</PlatformTarget>
10-
<OutputPath>..\1.4\Assemblies\</OutputPath>
9+
<OutputPath>..\1.5\Assemblies\</OutputPath>
1110
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1211
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
13-
<Version>1.2.1.0</Version>
12+
<Version>$(ModVersion)</Version>
13+
<AssemblyVersion>$(ModVersion)</AssemblyVersion>
14+
<FileVersion>$(ModVersion)</FileVersion>
15+
<PackageVersion>$(ModVersion)</PackageVersion>
16+
<InformationalVersion>$(ModVersion)</InformationalVersion>
17+
<Company>Brrainz</Company>
18+
<Authors>Andreas Pardeike</Authors>
1419
<Copyright>Copyright Andreas Pardeike</Copyright>
20+
<PackageProjectUrl>$(Repository)</PackageProjectUrl>
21+
<RepositoryUrl>$(Repository)</RepositoryUrl>
22+
<Product>$(ModName)</Product>
1523
</PropertyGroup>
1624

1725
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -30,14 +38,15 @@
3038
</PropertyGroup>
3139

3240
<ItemGroup>
33-
<PackageReference Include="Brrainz.RimWorld.CrossPromotion" Version="1.0.0" />
34-
<PackageReference Include="Krafs.Rimworld.Ref" Version="1.4.3641" GeneratePathProperty="true" />
35-
<PackageReference Include="Lib.Harmony" Version="2.2.2">
36-
<ExcludeAssets>runtime</ExcludeAssets>
37-
<PrivateAssets>all</PrivateAssets>
38-
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39-
</PackageReference>
40-
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.0" />
41+
<Content Include="..\Directory.Build.props">
42+
<Link>%(Filename)%(Extension)</Link>
43+
</Content>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<PackageReference Include="Brrainz.RimWorld.CrossPromotion" Version="1.1.1" />
48+
<PackageReference Include="Lib.Harmony" Version="2.3.1.1" ExcludeAssets="runtime" />
49+
<PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
4150
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net472" Version="1.0.3">
4251
<PrivateAssets>all</PrivateAssets>
4352
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -46,16 +55,47 @@
4655
</ItemGroup>
4756

4857
<ItemGroup>
49-
<Reference Include="0Harmony">
50-
<HintPath>..\0Harmony.dll</HintPath>
51-
<Private>true</Private>
58+
<Reference Include="Assembly-CSharp">
59+
<HintPath>..\..\_publicized\Assembly-CSharp.dll</HintPath>
60+
<Private>False</Private>
61+
</Reference>
62+
<Reference Include="Assembly-CSharp-firstpass">
63+
<HintPath>..\..\_publicized\Assembly-CSharp-firstpass.dll</HintPath>
64+
<Private>False</Private>
65+
</Reference>
66+
<Reference Include="com.rlabrecque.steamworks.net">
67+
<HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\com.rlabrecque.steamworks.net.dll</HintPath>
68+
</Reference>
69+
<Reference Include="UnityEngine.CoreModule">
70+
<HintPath>..\..\_publicized\UnityEngine\UnityEngine.CoreModule.dll</HintPath>
71+
<Private>False</Private>
72+
</Reference>
73+
<Reference Include="UnityEngine.AudioModule">
74+
<HintPath>..\..\_publicized\UnityEngine\UnityEngine.AudioModule.dll</HintPath>
75+
<Private>False</Private>
76+
</Reference>
77+
<Reference Include="UnityEngine.IMGUIModule">
78+
<HintPath>..\..\_publicized\UnityEngine\UnityEngine.IMGUIModule.dll</HintPath>
79+
<Private>False</Private>
80+
</Reference>
81+
<Reference Include="UnityEngine.JSONSerializeModule">
82+
<HintPath>..\..\_publicized\UnityEngine\UnityEngine.JSONSerializeModule.dll</HintPath>
83+
<Private>False</Private>
84+
</Reference>
85+
<Reference Include="UnityEngine.InputLegacyModule">
86+
<HintPath>..\..\_publicized\UnityEngine\UnityEngine.InputLegacyModule.dll</HintPath>
87+
<Private>False</Private>
88+
</Reference>
89+
<Reference Include="UnityEngine.TextRenderingModule">
90+
<HintPath>..\..\_publicized\UnityEngine\UnityEngine.TextRenderingModule.dll</HintPath>
91+
<Private>False</Private>
5292
</Reference>
5393
</ItemGroup>
5494

55-
<Target Name="MyCode" BeforeTargets="UpdateReferences">
95+
<!--<Target Name="MyCode" BeforeTargets="UpdateReferences">
5696
<PropertyGroup>
57-
<AssemblyCSharp>$(PkgKrafs_Rimworld_Ref)\ref\net472\Assembly-CSharp.dll</AssemblyCSharp>
58-
<PubliciseOutputPath>$(PkgKrafs_Rimworld_Ref)\ref\net472\</PubliciseOutputPath>
97+
<AssemblyCSharp>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll</AssemblyCSharp>
98+
<PubliciseOutputPath>C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Publicized\</PubliciseOutputPath>
5999
<AssemblyCSharp_Publicised>$(PubliciseOutputPath)Assembly-CSharp_publicised.dll</AssemblyCSharp_Publicised>
60100
</PropertyGroup>
61101
<Message Importance="High" Text="Publicising Rimworld Assembly ..." />
@@ -69,33 +109,51 @@
69109
<Private>false</Private>
70110
</Reference>
71111
</ItemGroup>
72-
</Target>
112+
</Target>-->
73113

74-
<Target Name="UpdateReferences" AfterTargets="ResolveLockFileReferences">
114+
<!--<Target Name="UpdateReferences" AfterTargets="ResolveLockFileReferences">
75115
<Message Importance="High" Text="Remove References ..." />
76116
<ItemGroup>
77-
<Reference Remove="$(PkgKrafs_Rimworld_Ref)\ref\net472\Assembly-CSharp.dll" />
117+
<Reference Remove="C:\Program Files (x86)\Steam\steamapps\common\RimWorld\RimWorldWin64_Data\Managed\Assembly-CSharp.dll" />
78118
</ItemGroup>
119+
</Target>-->
120+
121+
<Target Name="PostBuildAction" AfterTargets="Build">
122+
<XmlPoke XmlInputPath="$(MSBuildProjectDirectory)\..\About\About.xml" Query="//ModMetaData/modVersion" Value="$(ModVersion)" />
123+
<XmlPoke XmlInputPath="$(MSBuildProjectDirectory)\..\About\Manifest.xml" Query="//Manifest/version" Value="$(ModVersion)" />
79124
</Target>
80125

81-
<PropertyGroup>
82-
<PostBuildEvent>
83-
echo Postprocessing
84-
where ModBuilder 2&gt; nul | find /i "ModBuilder.exe"
85-
if not errorlevel 1 (
86-
ModBuilder AssemblyVersion -file "$(MSBuildProjectDirectory)\$(OutputPath)$(AssemblyName).dll" -save "$(MSBuildProjectName)-version"
87-
ModBuilder XMLPut -file "$(MSBuildProjectDirectory)\..\About\Manifest.xml" -xpath /Manifest/version -value "{{$(MSBuildProjectName)-version}}"
88-
)
89-
if defined INSTALL_MOD (
90-
"%INSTALL_MOD%" "$(Configuration)" "$(MSBuildProjectDirectory)\..\" "$(MSBuildProjectName)" "About 1.2 1.3 1.4 Sounds Textures" "LoadFolders.xml"
91-
)
92-
</PostBuildEvent>
93-
<Company>Brrainz</Company>
94-
<Authors>Andreas Pardeike</Authors>
95-
<Description></Description>
96-
<PackageProjectUrl>https://github.com/pardeike/VisualExceptions</PackageProjectUrl>
97-
<RepositoryUrl>https://github.com/pardeike/VisualExceptions</RepositoryUrl>
98-
<Product>Visual Exceptions</Product>
99-
</PropertyGroup>
126+
<Target Name="CopyToRimworld" AfterTargets="PostBuildAction" Condition="'$(RIMWORLD_MOD_DIR)' != ''">
127+
<Delete Files="..\1.5\Assemblies\0Harmony.dll" />
128+
<RemoveDir Directories="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
129+
<ItemGroup>
130+
<Copy_11 Include="..\1.1\**" />
131+
<Copy_12 Include="..\1.2\**" />
132+
<Copy_13 Include="..\1.3\**" />
133+
<Copy_14 Include="..\1.4\**" />
134+
<Copy_15 Include="..\1.5\**" />
135+
<CopyAbout Include="..\About\**" />
136+
<CopySounds Include="..\Sounds\**" />
137+
<CopyTextures Include="..\Textures\**" />
138+
<CopyLicense Include="..\LICENSE" />
139+
<CopyLoadFolders Include="..\LoadFolders.xml" />
140+
<CopyReadme Include="..\README.md" />
141+
</ItemGroup>
142+
<Copy SourceFiles="@(Copy_11)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\1.1\%(RecursiveDir)" />
143+
<Copy SourceFiles="@(Copy_12)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\1.2\%(RecursiveDir)" />
144+
<Copy SourceFiles="@(Copy_13)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\1.3\%(RecursiveDir)" />
145+
<Copy SourceFiles="@(Copy_14)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\1.4\%(RecursiveDir)" />
146+
<Copy SourceFiles="@(Copy_15)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\1.5\%(RecursiveDir)" />
147+
<Copy SourceFiles="@(CopyAbout)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\About\%(RecursiveDir)" />
148+
<Copy SourceFiles="@(CopySounds)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\Sounds\%(RecursiveDir)" />
149+
<Copy SourceFiles="@(CopyTextures)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)\Textures\%(RecursiveDir)" />
150+
<Copy SourceFiles="@(CopyLicense)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
151+
<Copy SourceFiles="@(CopyLoadFolders)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
152+
<Copy SourceFiles="@(CopyReadme)" DestinationFolder="$(RIMWORLD_MOD_DIR)\$(ModFileName)" />
153+
</Target>
154+
155+
<Target Name="ZipMod" AfterTargets="CopyToRimworld" Condition="'$(RIMWORLD_MOD_DIR)' != ''">
156+
<ZipDirectory SourceDirectory="$(RIMWORLD_MOD_DIR)\$(ModFileName)" DestinationFile="$(RIMWORLD_MOD_DIR)\$(ModFileName).zip" Overwrite="true" />
157+
</Target>
100158

101-
</Project>
159+
</Project>

0 commit comments

Comments
 (0)