Introduce defines

sailro · Feb 2, 2025 · 77e9c61 · 77e9c61
1 parent 7017b2a
commit 77e9c61
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 9 deletions.
diff --git a/BepInExPlugin/BepInExPlugin.csproj b/BepInExPlugin/BepInExPlugin.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -42,7 +42,7 @@
     <Reference Include="System.Core" />
     <Reference Include="netstandard">
       <HintPath>$(EFTManagedPath)\netstandard.dll</HintPath>
-    </Reference>  
+    </Reference>
     <!-- Unity -->
     <Reference Include="UnityEngine">
       <HintPath>$(EFTManagedPath)\UnityEngine.dll</HintPath>

diff --git a/Features/Feature.cs b/Features/Feature.cs
@@ -91,16 +91,31 @@ protected void AddConsoleLog(string log)
 			ConsoleScreen.Log(log);
 	}
 
-	public override ETranslateResult TranslateCommand(ECommand command)
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override ETranslateResult TranslateCommand(ECommand command)
 	{
 		return ETranslateResult.Ignore;
 	}
 
-	public override void TranslateAxes(ref float[] axes)
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override void TranslateAxes(ref float[] axes)
 	{
 	}
 
-	public override ECursorResult ShouldLockCursor()
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override ECursorResult ShouldLockCursor()
 	{
 		return ECursorResult.Ignore;
 	}

diff --git a/Features/FeatureRenderer.cs b/Features/FeatureRenderer.cs
@@ -397,7 +397,12 @@ private object RenderBooleanProperty(object currentValue, GUILayoutOption option
 		return newValue;
 	}
 
-	public override ETranslateResult TranslateCommand(ECommand command)
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override ETranslateResult TranslateCommand(ECommand command)
 	{
 		return command switch
 		{
@@ -407,14 +412,24 @@ public override ETranslateResult TranslateCommand(ECommand command)
 		};
 	}
 
-	public override void TranslateAxes(ref float[] axes)
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override void TranslateAxes(ref float[] axes)
 	{
 		// this will disable the axes for player movement
 		if (Enabled)
 			axes = null!;
 	}
 
-	public override ECursorResult ShouldLockCursor()
+#if EFT_LIVE 
+	protected
+#else
+	public
+#endif
+	override ECursorResult ShouldLockCursor()
 	{
 		return Enabled ? ECursorResult.ShowCursor : ECursorResult.Ignore;
 	}

diff --git a/Features/TemplateHelper.cs b/Features/TemplateHelper.cs
@@ -16,6 +16,7 @@ internal class TemplateHelper
 
 	private static void UpdateTemplates()
 	{
+#if !EFT_LIVE
 		if (!Singleton<ItemFactoryClass>.Instantiated)
 			return;
 
@@ -30,6 +31,7 @@ private static void UpdateTemplates()
 		{
 			_templates.Add(kv.Key.ToString(), kv.Value);
 		}
+#endif
 	}
 
 	internal static ItemTemplate[] FindTemplates(string searchShortNameOrTemplateId)

diff --git a/Installer/CompilationContext.cs b/Installer/CompilationContext.cs
@@ -12,6 +12,7 @@ internal class CompilationContext(Installation installation, string projectTitle
 	public string Project { get; set; } = project;
 	public string Branch { get; set; } = DefaultBranch;
 	public string[] Exclude { get; set; } = [];
+	public string[] Defines { get; set; } = [];
 	public ZipArchive? Archive { get; set; }
 	public bool IsFatalFailure { get; set; } = false;
 	public string Language { get; set; } = "";

diff --git a/Installer/Compiler.cs b/Installer/Compiler.cs
@@ -35,6 +35,7 @@ public Compiler(ZipArchive projectArchive, CompilationContext context)
 		ProjectArchive = projectArchive;
 		Installation = context.Installation;
 		Exclude = context.Exclude;
+		Defines = context.Defines;
 		ProjectContent = string.Empty;
 
 		var entry = projectArchive.Entries.FirstOrDefault(e => e.Name == context.Project) ?? throw new ArgumentException($"Project {context.Project} not found!");

diff --git a/Installer/InstallCommand.cs b/Installer/InstallCommand.cs
@@ -155,6 +155,7 @@ private static async Task<CompilationResult> BuildTrainerAsync(Settings settings
 		{
 			Exclude = [.. settings.DisabledFeatures!, .. settings.DisabledCommands!],
 			Branch = GetInitialBranch(settings),
+			Defines = installation.UsingSptAki ? [] : ["EFT_LIVE"],
 			Language = settings.Language
 		};
 

diff --git a/NLog.EFT.Trainer.csproj b/NLog.EFT.Trainer.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>