7.0 update

Co-Authored-By: GiR-Blunti <700028+GiR-Blunti@users.noreply.github.com>
BardMusicPlayer · Jul 30, 2024 · 027f81b · 027f81b
1 parent 49dc68c
commit 027f81b
Show file tree

Hide file tree

Showing 31 changed files with 1,216 additions and 943 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -0,0 +1,34 @@
+name: Build
+
+on:
+  push:
+    branches: [ develop ]
+
+jobs:
+
+  build:
+    runs-on: windows-latest
+
+    env:
+      Solution_Name: DalamudDoot
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: Download Dalamud
+      run: |
+        Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip
+        Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev"
+
+    - name: Build with dotnet
+      run: dotnet build --configuration Release
+
+    - name: Move latest build to Release
+      run: Move-Item -Path ./DalamudDoot/bin/x64/Release/DalamudDoot/* -Destination ./data -Force
+
+    - name: Commit latest build
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: "Update Build"
+        file_pattern: "./data/*.json ./data/*.zip"
diff --git a/.github/workflows/MERGE-develop.yml b/.github/workflows/MERGE-develop.yml
diff --git a/.github/workflows/PR-develop.yml b/.github/workflows/PR-develop.yml
diff --git a/HypnotoadPlugin.sln → DalamudDoot.sln b/HypnotoadPlugin.sln → DalamudDoot.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.2.32602.215
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HypnotoadPlugin", "HypnotoadPlugin\HypnotoadPlugin.csproj", "{13C812E9-0D42-4B95-8646-40EEBF30636F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DalamudDoot", "DalamudDoot\DalamudDoot.csproj", "{13C812E9-0D42-4B95-8646-40EEBF30636F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/HypnotoadPlugin/Configuration.cs → DalamudDoot/Configuration.cs b/HypnotoadPlugin/Configuration.cs → DalamudDoot/Configuration.cs
@@ -1,7 +1,12 @@
-using Dalamud.Configuration;
+/*
+ * Copyright(c) 2023 GiR-Zippo
+ * Licensed under the GPL v3 license. See https://github.com/GiR-Zippo/LightAmp/blob/main/LICENSE for full license information.
+ */
+
+using Dalamud.Configuration;
 using Dalamud.Plugin;
 
-namespace HypnotoadPlugin;
+namespace DalamudDoot;
 
 [Serializable]
 public class Configuration : IPluginConfiguration
@@ -13,9 +18,9 @@ public class Configuration : IPluginConfiguration
     // the below exist just to make saving less cumbersome
 
     [NonSerialized]
-    private DalamudPluginInterface? _pluginInterface;
+    private IDalamudPluginInterface _pluginInterface;
 
-    public void Initialize(DalamudPluginInterface? pluginInterface)
+    public void Initialize(IDalamudPluginInterface pluginInterface)
     {
         _pluginInterface = pluginInterface;
     }

diff --git a/HypnotoadPlugin/HypnotoadPlugin.csproj → DalamudDoot/DalamudDoot.csproj b/HypnotoadPlugin/HypnotoadPlugin.csproj → DalamudDoot/DalamudDoot.csproj
@@ -1,44 +1,49 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <Platforms>x64</Platforms>
+    <PlatformTarget>x64</PlatformTarget>
+    <Configurations>Debug;Release</Configurations>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <Nullable>disable</Nullable>
+
+    <Description>MeowMusic companion for enhanced functionality.</Description>
+    <PackageProjectUrl>https://github.com/BardMusicPlayer/DalamudDoot</PackageProjectUrl>
+    <Version>0.0.1.17</Version>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <Description>BardMusicPlayer &amp; LightAmp companion for enhanced functionality.</Description>
-    <PackageProjectUrl>https://github.com/BardMusicPlayer/Hypnotoad-Plugin</PackageProjectUrl>
-    <Version>0.0.1.12</Version>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
+    <DebugType>portable</DebugType>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <Optimize>false</Optimize>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
   </PropertyGroup>
 
   <PropertyGroup>
     <DalamudLibPath>$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
     <IsPublishable>True</IsPublishable>
+    <SupportedOSPlatformVersion>8.0</SupportedOSPlatformVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="..\Data\icon.png" CopyToOutputDirectory="PreserveNewest" Visible="false" />
+    <Content Include="..\data\icon.png" CopyToOutputDirectory="PreserveNewest" Visible="false" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DalamudPackager" Version="2.1.10" />
-    <PackageReference Include="Fody" Version="6.6.4" PrivateAssets="all" />
-    <PackageReference Include="H.Formatters" Version="2.0.45" />
-    <PackageReference Include="H.Formatters.Newtonsoft.Json" Version="13.0.45" />
-    <PackageReference Include="H.Pipes" Version="2.0.45" />
-    <PackageReference Include="H.Pipes.AccessControl" Version="2.0.45" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3-beta1" />
-    <PackageReference Include="Resourcer.Fody" Version="1.8.1" PrivateAssets="all" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
-    <PackageReference Include="TinyIpc" Version="4.1.2" />
-    <PackageReference Include="XivCommon" Version="7.0.0-alpha.1" />
+    <PackageReference Include="DalamudPackager" Version="2.1.13" />
+    <PackageReference Include="H.Formatters.Newtonsoft.Json" Version="13.0.59" />
+    <PackageReference Include="H.Pipes.AccessControl" Version="2.0.59" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>
@@ -51,17 +56,8 @@
     <Reference Include="Newtonsoft.Json" HintPath="$(AppData)\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll" Private="false" />
   </ItemGroup>
 
-  <Target Name="CleanOutDir" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
-    <ItemGroup>
-      <DeleteAssemblies Include="$(TargetDir)*.pdb" />
-      <DeleteAssemblies Include="$(TargetDir)$(AssemblyName).deps.json" />
-    </ItemGroup>
-    <Message Text="Deleting @(DeleteAssemblies)" Importance="high" />
-    <Delete Files="@(DeleteAssemblies)" />
-    <RemoveDir Directories="$(TargetDir)\ref\" />
-  </Target>
-
-  <Target Name="PackagePlugin" AfterTargets="CleanOutDir" Condition="'$(Configuration)' == 'Release'">
+  <Target Name="PackagePlugin" Condition="'$(Configuration)' == 'Release'">
     <DalamudPackager ProjectDir="$(ProjectDir)" OutputPath="$(OutputPath)" Exclude="*.pdb;" AssemblyName="$(AssemblyName)" />
   </Target>
+
 </Project>
diff --git a/DalamudDoot/DalamudDoot.json b/DalamudDoot/DalamudDoot.json
@@ -0,0 +1,13 @@
+{
+    "Author": "GiR-Zippo, Meowchestra, MoogleTroupe",
+    "Name": "DalamudDoot",
+    "InternalName": "DalamudDoot",
+    "Punchline": "Bard Music Player 2 companion plugin.",
+    "Description": "Bard Music Player 2 companion plugin.",
+    "ApplicableVersion": "any",
+    "Tags": [
+        "Midi",
+        "Performance",
+        "Bard"
+    ]
+}
diff --git a/HypnotoadPlugin/MessageEnums.cs → DalamudDoot/MessageEnums.cs b/HypnotoadPlugin/MessageEnums.cs → DalamudDoot/MessageEnums.cs
@@ -1,22 +1,30 @@
-using System.Collections.ObjectModel;
+/*
+ * Copyright(c) 2023 GiR-Zippo
+ * Licensed under the GPL v3 license. See https://github.com/GiR-Zippo/LightAmp/blob/main/LICENSE for full license information.
+ */
 
-namespace HypnotoadPlugin;
+using System.Collections.ObjectModel;
+
+namespace DalamudDoot;
 
 public enum MessageType
 {
     None = 0,
     Handshake = 1,
     Version = 2,
 
-    SetGfx = 10,
+    SetGfx = 10, //Get<->Set
+    NameAndHomeWorld = 11, //Get
+    SetSoundOnOff = 12, //Set<->Get
 
     Instrument = 20,
     NoteOn = 21,
     NoteOff = 22,
     ProgramChange = 23,
 
-    StartEnsemble = 30,
+    StartEnsemble = 30, //Get<->Set
     AcceptReply = 31,
+    PerformanceModeState = 32, //Get
 
     Chat = 40,
 
@@ -25,11 +33,11 @@ public enum MessageType
 
 public readonly struct ChatMessageChannelType
 {
-    public static readonly  ChatMessageChannelType None        = new("None",         0x0000, "");
-    private static readonly ChatMessageChannelType Say         = new("Say",          0x000A, "/s");
-    private static readonly ChatMessageChannelType Yell        = new("Yell",         0x001E, "/y");
-    private static readonly ChatMessageChannelType Shout       = new("Shout",        0x000B, "/sh");
-    private static readonly ChatMessageChannelType Party       = new("Party",        0x000E, "/p");
+    public static readonly ChatMessageChannelType None = new("None", 0x0000, "");
+    private static readonly ChatMessageChannelType Say = new("Say", 0x000A, "/s");
+    private static readonly ChatMessageChannelType Yell = new("Yell", 0x001E, "/y");
+    private static readonly ChatMessageChannelType Shout = new("Shout", 0x000B, "/sh");
+    private static readonly ChatMessageChannelType Party = new("Party", 0x000E, "/p");
     private static readonly ChatMessageChannelType FreeCompany = new("Free Company", 0x0018, "/fc");
 
     private static readonly IReadOnlyList<ChatMessageChannelType> All = new ReadOnlyCollection<ChatMessageChannelType>(new List<ChatMessageChannelType>
@@ -43,14 +51,13 @@ public readonly struct ChatMessageChannelType
     });
 
     private string Name { get; }
-
     private int ChannelCode { get; }
     public string ChannelShortCut { get; }
 
     private ChatMessageChannelType(string name, int channelCode, string channelShortCut)
     {
-        Name            = name;
-        ChannelCode     = channelCode;
+        Name = name;
+        ChannelCode = channelCode;
         ChannelShortCut = channelShortCut;
     }