Ottermandias · May 18, 2024 · May 18, 2024 · May 19, 2024 · May 20, 2024 · May 21, 2024
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -0,0 +1,47 @@
+name: Publish
+on:
+  push:
+    tags:
+      - '*.*.*.*'
+jobs:
+  Build:
+    permissions:
+      contents: write
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Get Environment Variables
+        run: |
+          $tag = "${{ github.ref }}" -replace 'refs/tags/', ''
+
+          "tag=$tag" | Out-File -Append -FilePath $Env:GITHUB_ENV
+          
+      - name: Set up .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 9.0.x
+
+      - name: Download Dalamud Latest
+        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: Restore Nuget Packages
+        run: dotnet restore Gatherbuddy/Gatherbuddy.csproj
+
+      - name: Build Plugin
+        run: dotnet build --no-restore -c Release Gatherbuddy/Gatherbuddy.csproj -p:AssemblyVersion=${{ env.tag }} -p:FileVersion=${{ env.tag }} -p:PackageVersion=${{ env.tag }} -p:InformationalVersion=${{ env.tag }} --output .\build
+
+      - name: Zip Plugin
+        run: Compress-Archive -Path .\build\* -DestinationPath .\build\GatherbuddyReborn.zip
+
+      - name: Publish Plugin
+        uses: softprops/action-gh-release@v2
+        with:
+          files: ./build/GatherbuddyReborn.zip
+          token: ${{ secrets.GITHUB_TOKEN }}
+
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 bin/
 obj/
-.vs/
+.vs/
+.idea/
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,6 @@
 	path = OtterGui
 	url = https://github.com/Ottermandias/OtterGui.git
 	branch = main
+[submodule "ECommons"]
+	path = ECommons
+	url = https://github.com/NightmareXIV/ECommons
diff --git a/ECommons b/ECommons
diff --git a/GatherBuddy.GameData/Classes/Fish.cs b/GatherBuddy.GameData/Classes/Fish.cs
@@ -9,6 +9,7 @@
 using ItemRow = Lumina.Excel.Sheets.Item;
 using FishRow = Lumina.Excel.Sheets.FishParameter;
 using SpearFishRow = Lumina.Excel.Sheets.SpearfishingItem;
+using FFXIVClientStructs.FFXIV.Client.Game;
 
 namespace GatherBuddy.Classes;
 

diff --git a/GatherBuddy.GameData/Classes/FishingSpot.cs b/GatherBuddy.GameData/Classes/FishingSpot.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
 using GatherBuddy.Interfaces;
 using GatherBuddy.Structs;
 using GatherBuddy.Utility;
@@ -62,6 +63,8 @@ public ObjectType Type
     public bool Spearfishing
         => _data is SpearfishingNotebook;
 
+    public Dictionary<uint, List<Vector3>> WorldPositions { get; internal set; } = new();
+
     public int CompareTo(FishingSpot? obj)
         => SheetId.CompareTo(obj?.SheetId ?? 0);
 

diff --git a/GatherBuddy.GameData/Classes/Gatherable.cs b/GatherBuddy.GameData/Classes/Gatherable.cs
@@ -65,6 +65,10 @@ public override string ToString()
     public int CompareTo(Gatherable? rhs)
         => ItemId.CompareTo(rhs?.ItemId ?? 0);
 
+    public bool IsCrystal => ItemData.FilterGroup == 11;
+
+    public bool IsTreasureMap => ItemData.FilterGroup == 18;
+
     private readonly int _levelStars;
 
     private static readonly string[] StarsArray =

diff --git a/GatherBuddy.GameData/Classes/Node.Base.cs b/GatherBuddy.GameData/Classes/Node.Base.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
 using GatherBuddy.Enums;
 using GatherBuddy.Interfaces;
 using GatherBuddy.Structs;
@@ -42,6 +43,7 @@ public bool IsBotanist
 
     public string Folklore { get; init; }
 
+
     public GatheringNode(GameData data, IReadOnlyDictionary<uint, List<uint>> gatheringPoint,
         IReadOnlyDictionary<uint, List<uint>> gatheringItemPoint, GatheringPointBase node)
     {
@@ -58,6 +60,12 @@ public GatheringNode(GameData data, IReadOnlyDictionary<uint, List<uint>> gather
         var coordRow = coords.GetRowOrDefault(node.RowId);
         IntegralXCoord = coordRow != null ? Maps.NodeToMap(coordRow.Value.X, Territory.SizeFactor) : 100;
         IntegralYCoord = coordRow != null ? Maps.NodeToMap(coordRow.Value.Y, Territory.SizeFactor) : 100;
+
+        foreach (var nodeRow2 in nodeList)
+        {
+            var worldCoords = data.WorldCoords.TryGetValue(nodeRow2, out var wc) ? wc : new List<Vector3>();
+            WorldPositions[nodeRow2] = worldCoords;
+        }
 
         Radius = coordRow?.Radius ?? 10;
 

diff --git a/GatherBuddy.GameData/Classes/Node.Location.cs b/GatherBuddy.GameData/Classes/Node.Location.cs
@@ -1,3 +1,7 @@
+using System;
+using System.Collections.Generic;
+using System.Numerics;
+
 namespace GatherBuddy.Classes;
 
 public partial class GatheringNode
@@ -14,4 +18,5 @@ public partial class GatheringNode
 
     public ushort Radius        { get; set; }
     public ushort DefaultRadius { get; internal set; }
+    public Dictionary<uint, List<Vector3>> WorldPositions { get; internal set; } = new();
 }
diff --git a/GatherBuddy.GameData/Data/ForcedAetherytes.cs b/GatherBuddy.GameData/Data/ForcedAetherytes.cs
@@ -48,8 +48,8 @@ public static readonly (uint NodeId, uint AetheryteId)[] Aetherytes =
         (834, 172), // Rime Dolomite -> Camp Broken Glass
         (771, 106), // Rarefied Shiitake Mushroom -> Onokoro
         (682, 148), // Purpure -> Macarenses Angle
-        (310, 104), // Rarefied Raw Triphane -> Rhalgr's Reach
-        (312, 111), // Rarefied Raw Star Spinel -> Kugane
+        //(310, 104), // Rarefied Raw Triphane -> Rhalgr's Reach
+        //(312, 111), // Rarefied Raw Star Spinel -> Kugane
     };
 
     public static void Apply(GameData data)

diff --git a/GatherBuddy.GameData/GameData.cs b/GatherBuddy.GameData/GameData.cs
@@ -2,6 +2,9 @@
 using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Linq;
+using System.Numerics;
+using Dalamud;
+using Dalamud.Logging;
 using Dalamud.Game;
 using Dalamud.Plugin.Services;
 using Dalamud.Utility;
@@ -41,6 +44,7 @@ public class GameData
     public FrozenDictionary<uint, Bait>          Bait                  { get; } = FrozenDictionary<uint, Bait>.Empty;
     public FrozenDictionary<uint, Fish>          Fishes                { get; } = FrozenDictionary<uint, Fish>.Empty;
     public FrozenDictionary<uint, FishingSpot>   FishingSpots          { get; } = FrozenDictionary<uint, FishingSpot>.Empty;
+    public Dictionary<uint, List<Vector3>> WorldCoords           { get; init; } = new();
 
     public IReadOnlyList<OceanRoute> OceanRoutes   { get; } = Array.Empty<OceanRoute>();
     public OceanTimeline             OceanTimeline { get; } = null!;
@@ -63,10 +67,11 @@ public class GameData
             _ => (null, null),
         };
 
-    public GameData(IDataManager gameData, Logger log)
+    public GameData(IDataManager gameData, Logger log, Dictionary<uint, List<Vector3>> worldCoordsDict)
     {
         Log         = log;
         DataManager = gameData;
+        WorldCoords = worldCoordsDict;
         try
         {
             GatheringIcons = new GatheringIcons(gameData);

diff --git a/GatherBuddy.GameData/GatherBuddy.GameData.csproj b/GatherBuddy.GameData/GatherBuddy.GameData.csproj
@@ -1,9 +1,17 @@
 <Project Sdk="Dalamud.NET.Sdk/12.0.2">
   <PropertyGroup>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <LangVersion>preview</LangVersion>
+    <PlatformTarget>x64</PlatformTarget>
     <RootNamespace>GatherBuddy</RootNamespace>
     <AssemblyName>GatherBuddy.GameData</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <OutputPath>bin\$(Configuration)\</OutputPath>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277</MSBuildWarningsAsMessages>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Configurations>Debug;Release</Configurations>
+    <Platforms>x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -14,4 +22,43 @@
     <ProjectReference Include="..\GatherBuddy.Levenshtein\GatherBuddy.Levenshtein.csproj" />
     <ProjectReference Include="..\OtterGui\OtterGui.csproj" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Dalamud">
+      <HintPath>$(DalamudLibPath)Dalamud.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="FFXIVClientStructs">
+      <HintPath>$(DalamudLibPath)FFXIVClientStructs.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ImGui.NET">
+      <HintPath>$(DalamudLibPath)ImGui.NET.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ImGuiScene">
+      <HintPath>$(DalamudLibPath)ImGuiScene.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Lumina">
+      <HintPath>$(DalamudLibPath)Lumina.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Lumina.Excel">
+      <HintPath>$(DalamudLibPath)Lumina.Excel.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>$(DalamudLibPath)Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="InteropGenerator.Runtime">
+      <HintPath>$(DalamudLibPath)InteropGenerator.Runtime.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
 </Project>
diff --git a/GatherBuddy.GameData/Interfaces/IGatherable.cs b/GatherBuddy.GameData/Interfaces/IGatherable.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using GatherBuddy.Classes;
 using GatherBuddy.Utility;
 using Lumina.Excel.Sheets;
 

diff --git a/GatherBuddy.Levenshtein/GatherBuddy.Levenshtein.csproj b/GatherBuddy.Levenshtein/GatherBuddy.Levenshtein.csproj
@@ -1,9 +1,17 @@
 <Project Sdk="Dalamud.NET.Sdk/12.0.2">
   <PropertyGroup>
+    <TargetFramework>net9.0-windows</TargetFramework>
+    <LangVersion>preview</LangVersion>
+    <PlatformTarget>x64</PlatformTarget>
     <RootNamespace>GatherBuddy.Levenshtein</RootNamespace>
     <AssemblyName>GatherBuddy.Levenshtein</AssemblyName>
     <WarningLevel>4</WarningLevel>
     <OutputPath>bin\$(Configuration)\</OutputPath>
+    <MSBuildWarningsAsMessages>$(MSBuildWarningsAsMessages);MSB3277</MSBuildWarningsAsMessages>
+    <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <Configurations>Debug;Release</Configurations>
+    <Platforms>x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     bin/
     obj/
-    .vs/
+    .vs/
+    .idea/