From 34a6c6954e6b6720a13cfa669951d9c836ad0d44 Mon Sep 17 00:00:00 2001
From: RedBigz <signoff@redbigz.com>
Date: Tue, 26 Nov 2024 22:03:01 +1000
Subject: [PATCH] Do a massive fix-up :3

---
 ChatCommands.cs     |   8 +--
 Citlog.cs           |  13 ----
 Citrus.cs           |   8 ---
 Citruslib.csproj    | 160 ++++++++++++++++----------------------------
 CustomLootTables.cs |   3 -
 GameSettings.cs     |   9 ---
 6 files changed, 59 insertions(+), 142 deletions(-)

diff --git a/ChatCommands.cs b/ChatCommands.cs
index 33e157a..4c9563a 100644
--- a/ChatCommands.cs
+++ b/ChatCommands.cs
@@ -1,12 +1,8 @@
-using Landfall.Network;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Landfall.Network;
 using UnityEngine;
-using Epic.OnlineServices.AntiCheatCommon;
 using Newtonsoft.Json;
 
 namespace CitrusLib
diff --git a/Citlog.cs b/Citlog.cs
index 51295d7..88bb037 100644
--- a/Citlog.cs
+++ b/Citlog.cs
@@ -1,17 +1,4 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using BepInEx;
-using Epic.OnlineServices;
-using HarmonyLib;
-using Landfall.Network;
-using Unity.Collections;
-using Unity.Networking.Transport;
 using UnityEngine;
 
 
diff --git a/Citrus.cs b/Citrus.cs
index 1c9b586..e66655c 100644
--- a/Citrus.cs
+++ b/Citrus.cs
@@ -1,16 +1,8 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
 using System.Threading.Tasks;
-using BepInEx;
-using Epic.OnlineServices;
-using HarmonyLib;
 using Landfall.Network;
-using Unity.Collections;
 using Unity.Networking.Transport;
 using UnityEngine;
 
diff --git a/Citruslib.csproj b/Citruslib.csproj
index 067e2a4..61fc762 100644
--- a/Citruslib.csproj
+++ b/Citruslib.csproj
@@ -1,103 +1,57 @@
-<?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>{956E1ED9-B6CA-4E39-9017-AE0ED560C123}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>CitrusLib</RootNamespace>
-    <AssemblyName>CitrusLib</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <Deterministic>true</Deterministic>
-  </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>
-    <DocumentationFile>
-    </DocumentationFile>
-  </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="0Harmony">
-      <HintPath>..\Libraries\0Harmony.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\Libraries\Assembly-CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\Libraries\Assembly-CSharp-firstpass.dll</HintPath>
-    </Reference>
-    <Reference Include="BepInEx">
-      <HintPath>..\Libraries\BepInEx.dll</HintPath>
-    </Reference>
-    <Reference Include="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>E:\SteamLibrary\steamapps\common\TotallyAccurateBattlegroundsDedicatedServer\TABG_Data\Managed\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="Sirenix.Serialization">
-      <HintPath>..\Libraries\Sirenix.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Unity.Collections, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\TotallyAccurateBattlegroundsDedicatedServer\TABG_Data\Managed\Unity.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Networking.Transport">
-      <HintPath>E:\SteamLibrary\steamapps\common\TotallyAccurateBattlegroundsDedicatedServer\TABG_Data\Managed\Unity.Networking.Transport.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>..\Libraries\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>..\Libraries\UnityEngine.CoreModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.IMGUIModule">
-      <HintPath>..\Libraries\UnityEngine.IMGUIModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.JSONSerializeModule">
-      <HintPath>E:\SteamLibrary\steamapps\common\TotallyAccurateBattlegroundsDedicatedServer\TABG_Data\Managed\UnityEngine.JSONSerializeModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>..\Libraries\UnityEngine.PhysicsModule.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>..\Libraries\UnityEngine.UI.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Citrus.cs" />
-    <Compile Include="ChatCommands.cs" />
-    <Compile Include="Citlog.cs" />
-    <Compile Include="CustomLootTables.cs" />
-    <Compile Include="GameSettings.cs" />
-    <Compile Include="TABGPlayer.cs" />
-    <Compile Include="GuestBook.cs" />
-    <Compile Include="Loot.cs" />
-    <Compile Include="Main.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.1</TargetFramework>
+        <AssemblyName>CitrusLib</AssemblyName>
+        <Description>CitrusLib</Description>
+        <Version>0.0.0</Version>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+        <LangVersion>latest</LangVersion>
+        <RestoreAdditionalProjectSources>
+            https://api.nuget.org/v3/index.json;
+            https://nuget.bepinex.dev/v3/index.json;
+            https://nuget.samboy.dev/v3/index.json
+        </RestoreAdditionalProjectSources>
+        <RootNamespace>CitrusLib</RootNamespace>
+
+        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+        <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
+        <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
+        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+        <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
+        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="BepInEx.Analyzers" Version="1.*" PrivateAssets="all"/>
+        <PackageReference Include="BepInEx.Core" Version="5.*"/>
+        <PackageReference Include="BepInEx.PluginInfoProps" Version="2.*"/>
+        <PackageReference Include="UnityEngine.Modules" Version="2021.3.22" IncludeAssets="compile"/>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
+    </ItemGroup>
+
+    <PropertyGroup>
+        <!-- Your Game Folder -->
+        <TABGFolder>C:\Program Files (x86)\Steam\steamapps\common\TotallyAccurateBattlegroundsDedicatedServer</TABGFolder>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <TABGManaged>$(TABGFolder)\TABG_Data\Managed</TABGManaged>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Reference Include="$(TABGManaged)\Assembly-CSharp.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\Assembly-CSharp-firstpass.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\Unity.Collections.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\Unity.Networking.Transport.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\Unity.Postprocessing.Runtime.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\UnityEngine.UI.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\UnityEngine.SpatialTracking.dll" Private="false"/>
+        <Reference Include="$(TABGManaged)\Sirenix.Serialization.dll" Private="false"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'">
+        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="all"/>
+    </ItemGroup>
+</Project>
diff --git a/CustomLootTables.cs b/CustomLootTables.cs
index ff3a644..5a8e7c5 100644
--- a/CustomLootTables.cs
+++ b/CustomLootTables.cs
@@ -1,10 +1,7 @@
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using UnityEngine;
 
 namespace CitrusLib
diff --git a/GameSettings.cs b/GameSettings.cs
index 48be7c2..9f8c816 100644
--- a/GameSettings.cs
+++ b/GameSettings.cs
@@ -1,16 +1,7 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using BepInEx;
-using Epic.OnlineServices;
-using HarmonyLib;
-using Landfall.Network;
-using Unity.Collections;
 using Unity.Networking.Transport;
 using UnityEngine;
 using Newtonsoft.Json;