Skip to content

Commit

Permalink
Began separating mods into DLLs
Browse files Browse the repository at this point in the history
HOWEVER:
1. Need to confirm that the CORRECT (DynData) Version of MonoMod is installed in the Managed directory
2. Need to confirm that the DustDevilFramework.dll exists in the Managed directory
3. If these things are true, mods should load without any problems
  • Loading branch information
sc2ad committed Nov 13, 2018
1 parent 2fb9650 commit f7c68d2
Show file tree
Hide file tree
Showing 20 changed files with 417 additions and 26 deletions.
5 changes: 3 additions & 2 deletions DotE_Patch_Mod/AllowDustChangingWithCrystalMod.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
using Partiality.Modloader;
using DustDevilFramework;
using Partiality.Modloader;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace DotE_Patch_Mod
namespace DotE_Combo_Mod
{
class AllowDustChangingWithCrystalMod : PartialityMod
{
Expand Down
3 changes: 2 additions & 1 deletion DotE_Patch_Mod/CustomHeroMod.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Amplitude.Unity.Framework;
using Amplitude.Unity.Gui;
using Amplitude.Unity.Simulation;
using DustDevilFramework;
using MonoMod.Utils;
using Partiality.Modloader;
using System;
Expand All @@ -9,7 +10,7 @@
using System.Text;
using System.Threading.Tasks;

namespace DotE_Patch_Mod
namespace DotE_Combo_Mod
{
class CustomHeroMod : PartialityMod
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ProjectGuid>{6C04C85B-D183-45D2-98D5-0168B613DA54}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DotE_Patch_Mod</RootNamespace>
<AssemblyName>DotE_Patch_Mod</AssemblyName>
<RootNamespace>DotE_Combo_Mod</RootNamespace>
<AssemblyName>DotE_Combo_Mod</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
Expand Down Expand Up @@ -38,6 +38,10 @@
<HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DustDevilFramework">
<HintPath>C:\Users\Sc2ad\Desktop\Code\DotE Modding\DotE Mod\DotE Mod\DotE_Patch_Mod\DustDevilFramework\bin\Debug\DustDevilFramework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="HOOKS-Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\HOOKS-Assembly-CSharp.dll</HintPath>
<Private>False</Private>
Expand Down Expand Up @@ -81,10 +85,8 @@
<Compile Include="HomogenyPod.cs" />
<Compile Include="HomogenyPodConfig.cs" />
<Compile Include="HomogenyPodUtil.cs" />
<Compile Include="PodMod.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourceLimiterMod.cs" />
<Compile Include="ScadMod.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
17 changes: 16 additions & 1 deletion DotE_Patch_Mod/DotE_Patch_Mod.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.16
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotE_Patch_Mod", "DotE_Patch_Mod.csproj", "{6C04C85B-D183-45D2-98D5-0168B613DA54}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotE_Combo_Mod", "DotE_Combo_Mod.csproj", "{6C04C85B-D183-45D2-98D5-0168B613DA54}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DustDevilFramework", "DustDevilFramework\DustDevilFramework.csproj", "{C984CE07-D68C-443D-9558-A317A20CE3FA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DustlessPod-Mod", "DustlessPod-Mod\DustlessPod-Mod.csproj", "{C53BE1C5-3C99-4BF4-ACE8-37EC4A745011}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -15,8 +19,19 @@ Global
{6C04C85B-D183-45D2-98D5-0168B613DA54}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6C04C85B-D183-45D2-98D5-0168B613DA54}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6C04C85B-D183-45D2-98D5-0168B613DA54}.Release|Any CPU.Build.0 = Release|Any CPU
{C984CE07-D68C-443D-9558-A317A20CE3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C984CE07-D68C-443D-9558-A317A20CE3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C984CE07-D68C-443D-9558-A317A20CE3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C984CE07-D68C-443D-9558-A317A20CE3FA}.Release|Any CPU.Build.0 = Release|Any CPU
{C53BE1C5-3C99-4BF4-ACE8-37EC4A745011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C53BE1C5-3C99-4BF4-ACE8-37EC4A745011}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C53BE1C5-3C99-4BF4-ACE8-37EC4A745011}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C53BE1C5-3C99-4BF4-ACE8-37EC4A745011}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7017B829-A763-492B-A5C0-CE0C7C15F6AB}
EndGlobalSection
EndGlobal
70 changes: 70 additions & 0 deletions DotE_Patch_Mod/DustDevilFramework/DustDevilFramework.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
<?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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C984CE07-D68C-443D-9558-A317A20CE3FA}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DustDevilFramework</RootNamespace>
<AssemblyName>DustDevilFramework</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</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="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="HOOKS-Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\HOOKS-Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="MonoMod.Utils">
<HintPath>..\..\..\..\..\Partiality\bin\MonoMod.Utils.dll</HintPath>
<Private>False</Private>
</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" />
<Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="PodMod.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScadMod.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
using System.Text;
using System.Threading.Tasks;

namespace DotE_Patch_Mod
namespace DustDevilFramework
{
abstract class PodMod : ScadMod
public abstract class PodMod : ScadMod
{
public abstract string GetName();
public abstract string GetDescription();
Expand Down
36 changes: 36 additions & 0 deletions DotE_Patch_Mod/DustDevilFramework/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DustDevilFramework")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("DustDevilFramework")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("c984ce07-d68c-443d-9558-a317a20ce3fa")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
using Partiality.Modloader;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace DotE_Patch_Mod
namespace DustDevilFramework
{
class ScadMod
public class ScadMod
{
public string path = @"placeholder_log.txt";

Expand Down
5 changes: 3 additions & 2 deletions DotE_Patch_Mod/DustGeneratorMod.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
using MonoMod.Utils;
using DustDevilFramework;
using MonoMod.Utils;
using Partiality.Modloader;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace DotE_Patch_Mod
namespace DotE_Combo_Mod
{
class DustGeneratorMod : PartialityMod
{
Expand Down
94 changes: 94 additions & 0 deletions DotE_Patch_Mod/DustlessPod-Mod/DustlessPod-Mod.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{C53BE1C5-3C99-4BF4-ACE8-37EC4A745011}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>DustlessPod_Mod</RootNamespace>
<AssemblyName>DustlessPod-Mod</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</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="Amplitude">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\Amplitude.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DustDevilFramework">
<HintPath>..\DustDevilFramework\bin\Debug\DustDevilFramework.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="HOOKS-Assembly-CSharp">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\HOOKS-Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="MonoMod">
<HintPath>..\..\..\..\..\Partiality\bin\MonoMod.exe</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="MonoMod.RuntimeDetour">
<HintPath>..\..\..\..\..\Partiality\bin\MonoMod.RuntimeDetour.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="MonoMod.RuntimeDetour.HookGen">
<HintPath>..\..\..\..\..\Partiality\bin\MonoMod.RuntimeDetour.HookGen.exe</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="MonoMod.Utils">
<HintPath>..\..\..\..\..\Partiality\bin\MonoMod.Utils.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Partiality">
<HintPath>..\..\..\..\..\Partiality\bin\Partiality.dll</HintPath>
<Private>False</Private>
</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" />
<Reference Include="UnityEngine">
<HintPath>..\..\..\..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Dungeon of the Endless\DungeonoftheEndless_Data\Managed\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="DustlessPod.cs" />
<Compile Include="DustlessPodConfig.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
Loading

0 comments on commit f7c68d2

Please sign in to comment.