Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

renamed terraria to tmodloader #2016

Merged
merged 4 commits into from
May 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<UserControl x:Class="Aurora.Profiles.Terraria.Control_Terraria"
<UserControl x:Class="Aurora.Profiles.TModLoader.Control_TModLoader"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Expand All @@ -11,12 +11,11 @@

<Grid>
<TabControl>
<TabItem Header="Overview for Terraria">
<TabItem Header="Overview for TModLoader">
<StackPanel Margin="10">
<CheckBox x:Name="GameEnabled" Content="Enable Aurora to provide lighting effects with Terraria. Ensure you have read the below text." Checked="GameEnabled_Checked" Unchecked="GameEnabled_Checked" />
<CheckBox x:Name="GameEnabled" Content="Enable Aurora to provide lighting effects with TModLoader. Ensure you have read the below text." Checked="GameEnabled_Checked" Unchecked="GameEnabled_Checked" />
<TextBlock HorizontalAlignment="Left" Margin="0,10" TextWrapping="Wrap" MaxWidth="824">
<Run Text="Support for Terraria requires a mod so that Aurora is able to fetch the variables from the game. This mod requires TModLoader." />
<Run Text="These mods are not authored by the main Aurora developers and any issues with these mods should not be directed at them, but posted on the relevant Github site for the mod." />
<Run Text="You can also install the mod through the in-game Mod Browser"/>
</TextBlock>
<Button Content="TModLoader download" HorizontalAlignment="Left" Margin="0,0,0,0" Padding="10,2" Click="GoToTModLoaderPage_Click" Width="224" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Aurora.Profiles.Terraria.GSI;
using Aurora.Profiles.TModLoader.GSI;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
Expand All @@ -19,12 +19,13 @@
using System.Windows.Shapes;
using Xceed.Wpf.Toolkit;

namespace Aurora.Profiles.Terraria {
public partial class Control_Terraria : UserControl
namespace Aurora.Profiles.TModLoader
{
public partial class Control_TModLoader : UserControl
{
private Application profile;

public Control_Terraria(Application profile)
public Control_TModLoader(Application profile)
{
this.profile = profile;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
using Aurora.Profiles.Generic.GSI.Nodes;
using Aurora.Profiles.Terraria.GSI.Nodes;
using Aurora.Profiles.TModLoader.GSI.Nodes;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Aurora.Profiles.Terraria.GSI {
public class GameState_Terraria : GameState<GameState_Terraria> {
namespace Aurora.Profiles.TModLoader.GSI {
public class GameState_TModLoader : GameState<GameState_TModLoader> {
public ProviderNode Provider => NodeFor<ProviderNode>("provider");

public WorldNode World => NodeFor<WorldNode>("world");

public PlayerNode Player => NodeFor<PlayerNode>("player");

public GameState_Terraria() : base() { }
public GameState_TModLoader() : base() { }

/// <summary>
/// Creates a GameState_Terraria instance based on the passed JSON data.
/// </summary>
/// <param name="JSONstring"></param>
public GameState_Terraria(string JSONstring) : base(JSONstring) { }
public GameState_TModLoader(string JSONstring) : base(JSONstring) { }

/// <summary>
/// Creates a GameState_Terraria instance based on the data from the passed GameState instance.
/// </summary>
public GameState_Terraria(IGameState other) : base(other) { }
public GameState_TModLoader(IGameState other) : base(other) { }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;

namespace Aurora.Profiles.Terraria.GSI.Nodes
namespace Aurora.Profiles.TModLoader.GSI.Nodes
{
public enum TerrariaBiome
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;

namespace Aurora.Profiles.Terraria.GSI.Nodes {
namespace Aurora.Profiles.TModLoader.GSI.Nodes {
public enum TerrariaBoss
{
None = -1,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Aurora.Profiles.TModLoader
{
public class TModLoader : Application {
public TModLoader() : base(new LightEventConfig
{
Name = "TModLoader",
ID = "tmodloader",
AppID = "1281930",
ProcessNames = new[] { "tModLoader.exe" },
ProfileType = typeof(TModLoaderProfile),
OverviewControlType = typeof(Control_TModLoader),
GameStateType = typeof(GSI.GameState_TModLoader),
Event = new GameEvent_Generic(),
IconURI = "Resources/tmodloader.png"
})
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
using System.Threading.Tasks;
using DK = Aurora.Devices.DeviceKeys;

namespace Aurora.Profiles.Terraria {
public class TerrariaProfile : ApplicationProfile {
namespace Aurora.Profiles.TModLoader {
public class TModLoaderProfile : ApplicationProfile {
public override void Reset() {
base.Reset();

Expand Down

This file was deleted.

20 changes: 10 additions & 10 deletions Project-Aurora/Project-Aurora/Project-Aurora.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.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')" />
<PropertyGroup>
Expand Down Expand Up @@ -224,13 +224,13 @@
<Compile Include="Profiles\RocketLeague\GSI\Nodes\Team.cs" />
<Compile Include="Profiles\RocketLeague\Layers\RocketLeagueGoalExplosionLayerHandler.cs" />
<Compile Include="Profiles\Osu\GSI\Enums.cs" />
<Compile Include="Profiles\Terraria\GSI\GameState_Terraria.cs" />
<Compile Include="Profiles\Terraria\GSI\Nodes\PlayerNode.cs" />
<Compile Include="Profiles\Terraria\GSI\Nodes\WorldNode.cs" />
<Compile Include="Profiles\Terraria\TerrariaApplication.cs" />
<Compile Include="Profiles\Terraria\TerrariaProfile.cs" />
<Compile Include="Profiles\Terraria\Control_Terraria.xaml.cs">
<DependentUpon>Control_Terraria.xaml</DependentUpon>
<Compile Include="Profiles\TModLoader\GSI\GameState_TModLoader.cs" />
<Compile Include="Profiles\TModLoader\GSI\Nodes\PlayerNode.cs" />
<Compile Include="Profiles\TModLoader\GSI\Nodes\WorldNode.cs" />
<Compile Include="Profiles\TModLoader\TModLoaderApplication.cs" />
<Compile Include="Profiles\TModLoader\TModLoaderProfile.cs" />
<Compile Include="Profiles\TModLoader\Control_TModLoader.xaml.cs">
<DependentUpon>Control_TModLoader.xaml</DependentUpon>
</Compile>
<Compile Include="Settings\Control_LayerList.xaml.cs">
<DependentUpon>Control_LayerList.xaml</DependentUpon>
Expand Down Expand Up @@ -1609,9 +1609,9 @@
<Resource Include="Resources\elite_dangerous_256x256.png" />
<Content Include="RazerSdkWrapper.dll" />
<Resource Include="Resources\betterdiscord.png" />
<Resource Include="Resources\terraria_512x512.png" />
<Resource Include="Resources\icons8-font-size-30.png" />
<Resource Include="Resources\icons8-folder-30.png" />
<Resource Include="Resources\tmodloader.png" />
<Content Include="RGB.NET.Devices.Asus.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down Expand Up @@ -1733,7 +1733,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Profiles\Terraria\Control_Terraria.xaml">
<Page Include="Profiles\TModLoader\Control_TModLoader.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.