Skip to content

Commit aad33ab

Browse files
authored
Merge pull request #946 from FFXIV-CombatReborn/miscfixes
Misc fixes to extrarotation namespaces and moved to correct folder
2 parents d9db7f7 + 31b6234 commit aad33ab

File tree

3 files changed

+5
-42
lines changed

3 files changed

+5
-42
lines changed

RotationSolver/RebornRotations/Magical/Rabbs_BLM.cs renamed to RotationSolver/ExtraRotations/Magical/Rabbs_BLM.cs

Lines changed: 4 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,15 @@
1-
using Dalamud.Game.ClientState.Objects;
2-
using Dalamud.Game.ClientState.Objects.SubKinds;
3-
using Dalamud.Utility.Signatures;
4-
using ECommons;
5-
using ExCSS;
6-
using FFXIVClientStructs.FFXIV.Client.Game;
7-
using FFXIVClientStructs.FFXIV.Client.Game.Character;
8-
using FFXIVClientStructs.FFXIV.Client.Game.Gauge;
9-
using FFXIVClientStructs.FFXIV.Client.Game.Group;
10-
using FFXIVClientStructs.FFXIV.Client.Game.Object;
11-
using FFXIVClientStructs.FFXIV.Client.Game.UI;
12-
using Lumina.Excel;
13-
using Lumina.Excel.Sheets;
1+
using Lumina.Excel.Sheets;
142
using Lumina.Excel.Sheets.Experimental;
15-
using RotationSolver.Basic.Actions;
16-
using RotationSolver.Basic.Data;
17-
using RotationSolver.Basic.Rotations.Basic;
183
using System.ComponentModel;
194
using System.Diagnostics;
20-
using System.Diagnostics.Metrics;
21-
using System.Linq;
22-
using System.Runtime.Intrinsics.Arm;
23-
using System.Runtime.Serialization;
24-
using static Dalamud.Interface.Utility.Raii.ImRaii;
25-
using static FFXIVClientStructs.FFXIV.Client.UI.Misc.DataCenterHelper;
26-
using FFXIVClientStructs.FFXIV.Client.System.Framework;
27-
using FFXIVClientStructs.FFXIV.Client.UI;
28-
using FFXIVClientStructs.FFXIV.Client.UI.Misc;
29-
using System;
30-
using System.Collections.Generic;
31-
using LuminaAction = Lumina.Excel.Sheets.Action;
32-
using Dalamud.Game;
33-
using Dalamud.Interface.Windowing;
34-
using Dalamud.IoC;
35-
using Dalamud.Plugin;
36-
using Dalamud.Plugin.Services;
37-
using System.Collections.Concurrent;
385
using ActionSetting = RotationSolver.Basic.Actions.ActionSetting;
396

40-
41-
42-
43-
namespace RabbsRotationsNET8.Magical;
7+
namespace RotationSolver.ExtraRotations.Magical;
448
[Rotation("Rabbs Black Mage", CombatType.PvE, GameVersion = "7.3")]
45-
[SourceCode(Path = "main/RebornRotations/Magical/Rabbs_BLM.cs")]
9+
[SourceCode(Path = "main/ExtraRotations/Magical/Rabbs_BLM.cs")]
4610
[ExtraRotation]
4711

48-
public sealed class BLM_Gamma : BlackMageRotation
12+
public sealed class Rabbs_BLM : BlackMageRotation
4913
{
5014
#region Config Options
5115

RotationSolver/ExtraRotations/Magical/Testfile

Lines changed: 0 additions & 1 deletion
This file was deleted.

RotationSolver/ExtraRotations/Ranged/ChurinMCH.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace RotationSolver.ExtraRotations.Ranged;
55

66
[Rotation("Churin MCH", CombatType.PvE, GameVersion = "7.3", Description = "Kill it with kindness. And if that fails, kill it with sharp sticks or knives...or guns!")]
7-
[SourceCode(Path = "ArgentiRotations/Ranged/Machinist/ChurinMCH.cs")]
7+
[SourceCode(Path = "main/ExtraRotations/Ranged/ChurinMCH.cs")]
88
[ExtraRotation]
99
public sealed class ChurinMCH: MachinistRotation
1010
{

0 commit comments

Comments
 (0)