Skip to content
This repository was archived by the owner on May 9, 2023. It is now read-only.

Commit d399b6a

Browse files
sinai-devsinai-dev
committed
Merging the two projects into one with build configurations
Removed the "src_2018" project, since it's now 1:1 with the main project and the only difference is references. Now using build configurations and preprocessor directives to accomplish the same thing.
1 parent 0c30679 commit d399b6a

25 files changed

+66
-3605
lines changed

‎src/CppExplorer.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,15 @@ public class CppExplorer : MelonMod
1616
// consts
1717

1818
public const string ID = "com.sinai.cppexplorer";
19-
public const string NAME = "IL2CPP Runtime Explorer";
2019
public const string VERSION = "1.3.2";
2120
public const string AUTHOR = "Sinai";
2221

22+
#if Release_Unity2018
23+
public const string NAME = "IL2CPP Runtime Explorer (Unity 2018)";
24+
#else
25+
public const string NAME = "IL2CPP Runtime Explorer";
26+
#endif
27+
2328
// fields
2429

2530
public static CppExplorer Instance;

‎src/CppExplorer.csproj‎

Lines changed: 54 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,33 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Explorer</RootNamespace>
11-
<AssemblyName>CppExplorer</AssemblyName>
1211
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1312
<FileAlignment>512</FileAlignment>
1413
<Deterministic>true</Deterministic>
1514
<TargetFrameworkProfile />
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17+
<AssemblyName>CppExplorer</AssemblyName>
1818
<DebugSymbols>false</DebugSymbols>
1919
<DebugType>none</DebugType>
2020
<Optimize>false</Optimize>
2121
<OutputPath>..\Release\</OutputPath>
22-
<DefineConstants>
23-
</DefineConstants>
22+
<DefineConstants>DEBUG</DefineConstants>
2423
<ErrorReport>prompt</ErrorReport>
2524
<WarningLevel>4</WarningLevel>
2625
<PlatformTarget>x64</PlatformTarget>
2726
<Prefer32Bit>false</Prefer32Bit>
2827
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Unity2018|AnyCPU' ">
29+
<AssemblyName>CppExplorer_Unity2018</AssemblyName>
30+
<DebugSymbols>false</DebugSymbols>
31+
<DebugType>none</DebugType>
32+
<Optimize>false</Optimize>
33+
<OutputPath>..\Release\</OutputPath>
34+
<DefineConstants>Release_Unity2018</DefineConstants>
3435
<ErrorReport>prompt</ErrorReport>
3536
<WarningLevel>4</WarningLevel>
37+
<PlatformTarget>x64</PlatformTarget>
3638
<Prefer32Bit>false</Prefer32Bit>
3739
</PropertyGroup>
3840
<ItemGroup>
@@ -66,48 +68,70 @@
6668
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnhollowerRuntimeLib.dll</HintPath>
6769
<Private>False</Private>
6870
</Reference>
69-
<Reference Include="Unity.TextMeshPro">
70-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\Unity.TextMeshPro.dll</HintPath>
71+
<!-- Unity 2019 build (InputLegacyModule.dll) -->
72+
<Reference Include="UnityEngine" Condition="'$(Configuration)'=='Debug'">
73+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.dll</HintPath>
7174
<Private>False</Private>
7275
</Reference>
73-
<Reference Include="UnityEngine.CoreModule">
74-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
76+
<Reference Include="UnityEngine.CoreModule" Condition="'$(Configuration)'=='Debug'">
77+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
7578
<Private>False</Private>
7679
</Reference>
77-
<Reference Include="UnityEngine.IMGUIModule">
78-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.IMGUIModule.dll</HintPath>
80+
<Reference Include="UnityEngine.IMGUIModule" Condition="'$(Configuration)'=='Debug'">
81+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.IMGUIModule.dll</HintPath>
7982
<Private>False</Private>
8083
</Reference>
81-
<Reference Include="UnityEngine.InputLegacyModule">
82-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
84+
<Reference Include="UnityEngine.InputModule" Condition="'$(Configuration)'=='Debug'">
85+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.InputLegacyModule.dll</HintPath>
8386
<Private>False</Private>
8487
</Reference>
85-
<Reference Include="UnityEngine.InputModule">
86-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.InputModule.dll</HintPath>
88+
<Reference Include="UnityEngine.PhysicsModule" Condition="'$(Configuration)'=='Debug'">
89+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
8790
<Private>False</Private>
8891
</Reference>
89-
<Reference Include="UnityEngine.ParticleSystemModule">
90-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.ParticleSystemModule.dll</HintPath>
92+
<Reference Include="UnityEngine.TextRenderingModule" Condition="'$(Configuration)'=='Debug'">
93+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
9194
<Private>False</Private>
9295
</Reference>
93-
<Reference Include="UnityEngine.PhysicsModule">
94-
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
96+
<Reference Include="UnityEngine.UI" Condition="'$(Configuration)'=='Debug'">
97+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>
98+
<Private>False</Private>
99+
</Reference>
100+
<Reference Include="UnityEngine.UIElementsModule" Condition="'$(Configuration)'=='Debug'">
101+
<HintPath>..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.UIElementsModule.dll</HintPath>
102+
<Private>False</Private>
103+
</Reference>
104+
<!-- Unity 2018 build (InputModule.dll) -->
105+
<Reference Include="UnityEngine" Condition="'$(Configuration)'=='Release_Unity2018'">
106+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.dll</HintPath>
107+
<Private>False</Private>
108+
</Reference>
109+
<Reference Include="UnityEngine.CoreModule" Condition="'$(Configuration)'=='Release_Unity2018'">
110+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.CoreModule.dll</HintPath>
111+
<Private>False</Private>
112+
</Reference>
113+
<Reference Include="UnityEngine.IMGUIModule" Condition="'$(Configuration)'=='Release_Unity2018'">
114+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.IMGUIModule.dll</HintPath>
115+
<Private>False</Private>
116+
</Reference>
117+
<Reference Include="UnityEngine.InputModule" Condition="'$(Configuration)'=='Release_Unity2018'">
118+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.InputModule.dll</HintPath>
95119
<Private>False</Private>
96120
</Reference>
97-
<Reference Include="UnityEngine.TextRenderingModule">
98-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
121+
<Reference Include="UnityEngine.PhysicsModule" Condition="'$(Configuration)'=='Release_Unity2018'">
122+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.PhysicsModule.dll</HintPath>
99123
<Private>False</Private>
100124
</Reference>
101-
<Reference Include="UnityEngine.UI">
102-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>
125+
<Reference Include="UnityEngine.TextRenderingModule" Condition="'$(Configuration)'=='Release_Unity2018'">
126+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.TextRenderingModule.dll</HintPath>
103127
<Private>False</Private>
104128
</Reference>
105-
<Reference Include="UnityEngine.UIElementsModule">
106-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.UIElementsModule.dll</HintPath>
129+
<Reference Include="UnityEngine.UI" Condition="'$(Configuration)'=='Release_Unity2018'">
130+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.UI.dll</HintPath>
107131
<Private>False</Private>
108132
</Reference>
109-
<Reference Include="UnityEngine.UIModule">
110-
<HintPath>..\..\..\..\..\Steam\steamapps\common\Hellpoint\MelonLoader\Managed\UnityEngine.UIModule.dll</HintPath>
133+
<Reference Include="UnityEngine.UIElementsModule" Condition="'$(Configuration)'=='Release_Unity2018'">
134+
<HintPath>..\..\..\Steam\steamapps\common\VRChat\MelonLoader\Managed\UnityEngine.UIElementsModule.dll</HintPath>
111135
<Private>False</Private>
112136
</Reference>
113137
</ItemGroup>

‎src/CppExplorer.sln‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1010
Debug|Any CPU = Debug|Any CPU
11-
Release|Any CPU = Release|Any CPU
11+
Release_Unity2018|Any CPU = Release_Unity2018|Any CPU
1212
EndGlobalSection
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1414
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1515
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release|Any CPU.Build.0 = Release|Any CPU
16+
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_Unity2018|Any CPU.ActiveCfg = Release_Unity2018|Any CPU
17+
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_Unity2018|Any CPU.Build.0 = Release_Unity2018|Any CPU
1818
EndGlobalSection
1919
GlobalSection(SolutionProperties) = preSolution
2020
HideSolutionNode = FALSE

‎src/Inspectors/ReflectionWindow.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private void UpdateValues(bool forceAll = false)
7070
{
7171
foreach (var holder in this.m_FieldInfos)
7272
{
73-
if (m_search == "" || holder.fieldInfo.Name.ToLower().Contains(m_search.ToLower()))
73+
if (forceAll || m_search == "" || holder.fieldInfo.Name.ToLower().Contains(m_search.ToLower()))
7474
{
7575
holder.UpdateValue(m_object);
7676
}
@@ -81,7 +81,7 @@ private void UpdateValues(bool forceAll = false)
8181
{
8282
foreach (var holder in this.m_PropertyInfos)
8383
{
84-
if (m_search == "" || holder.propInfo.Name.ToLower().Contains(m_search.ToLower()))
84+
if (forceAll || m_search == "" || holder.propInfo.Name.ToLower().Contains(m_search.ToLower()))
8585
{
8686
holder.UpdateValue(m_object);
8787
}

‎src/MainMenu/MainMenu.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public void OnGUI()
5656
var origSkin = GUI.skin;
5757
GUI.skin = UIStyles.WindowSkin;
5858

59-
MainRect = GUI.Window(MainWindowID, MainRect, (GUI.WindowFunction)MainWindow, "IL2CPP Runtime Explorer");
59+
MainRect = GUI.Window(MainWindowID, MainRect, (GUI.WindowFunction)MainWindow, CppExplorer.NAME);
6060

6161
GUI.skin = origSkin;
6262
}

0 commit comments

Comments
 (0)