UXAssist and CheatEnabler update

CheatEnabler/CheatEnabler.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net472</TargetFramework>
     <BepInExPluginGuid>org.soardev.cheatenabler</BepInExPluginGuid>
     <Description>DSP MOD - CheatEnabler</Description>
-    <Version>2.3.28</Version>
+    <Version>2.3.29</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <PackageId>CheatEnabler</PackageId>
@@ -24,6 +24,17 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="all" />
   </ItemGroup>
 
+<!--
+  <ItemGroup>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\AssemblyFromGame\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>..\AssemblyFromGame\UnityEngine.UI.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+-->
+
   <ItemGroup>
     <ProjectReference Include="..\UXAssist\UXAssist.csproj" />
   </ItemGroup>

UXAssist/CHANGELOG.md

@@ -1,5 +1,7 @@
 ## Changlog
 
+* 1.2.17
+  + Fix wrong implementation of `Protect veins from exhaustion` which causes wrong display of vein stats and veins not consumed.
 * 1.2.16
   + New feature: `Cut conveyor belt`
     - Press shortcut key to cut conveyor belt under cursor.
@@ -246,6 +248,8 @@
 
 ## 更新日志
 
+* 1.2.17
+  + 修复了`保护矿脉不会耗尽`导致矿脉状态显示错误和矿脉未被消耗的错误实现
 * 1.2.16
   + 新功能：`切割传送带`
     - 按快捷键切割光标位置的传送带

UXAssist/Patches/FactoryPatch.cs

@@ -1063,13 +1063,13 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                                     {
                                         var groupIndex = (int)veinPool[veinId].groupIndex;
                                         amount -= usedCount;
+                                        veinPool[veinId].amount = amount;
                                         if (amount < __instance.minimumVeinAmount)
                                         {
                                             __instance.minimumVeinAmount = amount;
                                         }
 
-                                        var veinGroups = factory.veinGroups;
+                                        factory.veinGroups[groupIndex].amount -= usedCount;
-                                        veinGroups[groupIndex].amount = amount;
                                         factory.veinAnimPool[veinId].time = amount >= 20000 ? 0f : 1f - 0.00005f;
                                         if (amount <= 0)
                                         {
@@ -1173,10 +1173,10 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                                             usedCount = maxAllowed;
                                         }
 
-                                        amount = veinPool[veinId].amount -= usedCount;
+                                        amount -= usedCount;
-                                        var veinGroups = factory.veinGroups;
+                                        veinPool[veinId].amount = amount;
                                         var groupIndex = veinPool[veinId].groupIndex;
-                                        veinGroups[groupIndex].amount -= usedCount;
+                                        factory.veinGroups[groupIndex].amount -= usedCount;
                                         factory.veinAnimPool[veinId].time = amount >= 25000 ? 0f : 1f - amount * VeinData.oilSpeedMultiplier;
                                         if (amount <= 2500)
                                         {

UXAssist/UXAssist.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net472</TargetFramework>
     <BepInExPluginGuid>org.soardev.uxassist</BepInExPluginGuid>
     <Description>DSP MOD - UXAssist</Description>
-    <Version>1.2.16</Version>
+    <Version>1.2.17</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <PackageId>UXAssist</PackageId>
@@ -20,6 +20,18 @@
     <PackageReference Include="DysonSphereProgram.Modding.CommonAPI" Version="1.6.5" />
     <PackageReference Include="DysonSphereProgram.Modding.DSPModSave" Version="1.*" />
   </ItemGroup>
+
+<!--
+  <ItemGroup>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\AssemblyFromGame\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.UI">
+      <HintPath>..\AssemblyFromGame\UnityEngine.UI.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+-->
+
   <ItemGroup>
     <EmbeddedResource Include="assets/signal/energy-fragment.png" />
     <EmbeddedResource Include="assets/signal/memory.png" />

UXAssist/package/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "UXAssist",
-  "version_number": "1.2.16",
+  "version_number": "1.2.17",
   "website_url": "https://github.com/soarqin/DSP_Mods/tree/master/UXAssist",
   "description": "Some functions and patches for better user experience / 一些提升用户体验的功能和补丁",
   "dependencies": [