UXAssist v1.4.5

UXAssist/CHANGELOG.md

@@ -3,6 +3,12 @@
 
 ## Changlog
 
+* 1.4.5
+  * New feature: `Ctrl+Shift+Click to pick items from whole belts`, with 2 suboptions: `Include branches of belts` and `Include connected inserters`
+  * Patch [BlueprintTweaks](https://thunderstore.io/c/dyson-sphere-program/p/kremnev8/BlueprintTweaks/) temporarily to fix `Drag Remove` functions (And wait for limoka to merge the [Pull Request](https://github.com/limoka/DSP-Mods/pull/133)):
+    * Ground rendering is correct now.
+    * Dismantle logic follows offcial's implementation to avoid possible crashes.
+  * Fixed CommonAPI patch to make shortcut key settings saved as expect now, sorry for wrong implementation in last version.
 * 1.4.4
   * `Remember window position and size on last exit`: Fix compatiblity for game patch 0.10.33
   * `Real-time logistic stations info panel`: Try to fix a display issue.
@@ -350,6 +356,12 @@
 
 ## 更新日志
 
+* 1.4.5
+  * 新功能：`按住Ctrl+Shift点击从整条传送带抓取物品`，包含两个子选项：`包含传送带分支` 和 `包含连接的分拣器`
+  * 临时修复 [BlueprintTweaks](https://thunderstore.io/c/dyson-sphere-program/p/kremnev8/BlueprintTweaks/) 的 `拖拽拆除` 功能（等待 limoka 合并 [Pull Request](https://github.com/limoka/DSP-Mods/pull/133)）：
+    * 地面绘制现在已正确
+    * 拆除逻辑遵循官方实现，避免潜在崩溃可能
+  * 修正了 CommonAPI 的补丁，现在快捷键设置可以如预期保存了，不好意思上一版本实现有误
 * 1.4.4
   * `记住上次退出时的窗口位置和大小`：修复对游戏补丁0.10.33的兼容性
   * `物流站实时信息面板`：尝试修复一个显示问题

UXAssist/ModsCompat/BlueprintTweaks.cs

@@ -1,6 +1,9 @@
 using HarmonyLib;
+using System;
 using System.Collections.Generic;
 using System.Reflection;
+using System.Reflection.Emit;
+using UnityEngine;
 using UXAssist.Functions;
 
 namespace UXAssist.ModsCompat;
@@ -9,21 +12,92 @@ class BlueprintTweaks
 {
     public const string BlueprintTweaksGuid = "org.kremnev8.plugin.BlueprintTweaks";
     private static FieldInfo selectObjIdsField;
+    private static Type classTypeBlueprintTweaksPlugin;
+    private static Type classTypeUIBuildingGridPatch2;
 
     public static bool Run(Harmony harmony)
     {
         if (!BepInEx.Bootstrap.Chainloader.PluginInfos.TryGetValue(BlueprintTweaksGuid, out var pluginInfo)) return false;
         var assembly = pluginInfo.Instance.GetType().Assembly;
-        var classType = assembly.GetType("BlueprintTweaks.DragRemoveBuildTool");
-        if (classType == null) return false;
-        if (AccessTools.Method(classType, "DetermineMorePreviews") != null) return true;
-        selectObjIdsField = AccessTools.Field(classType, "selectObjIds");
-        harmony.Patch(AccessTools.Method(classType, "DeterminePreviews"),
+        var classTypeDragRemoveBuildTool = assembly.GetType("BlueprintTweaks.DragRemoveBuildTool");
+        if (classTypeDragRemoveBuildTool == null) return false;
+        if (AccessTools.Method(classTypeDragRemoveBuildTool, "DetermineMorePreviews") != null) return true;
+        classTypeBlueprintTweaksPlugin = assembly.GetType("BlueprintTweaks.BlueprintTweaksPlugin");
+        classTypeUIBuildingGridPatch2 = assembly.GetType("BlueprintTweaks.UIBuildingGridPatch2");
+        var UIBuildingGrid_Update = AccessTools.Method(typeof(UIBuildingGrid), nameof(UIBuildingGrid.Update));
+        harmony.Patch(AccessTools.Method(classTypeUIBuildingGridPatch2, "UpdateGrid"), null, null, new HarmonyMethod(AccessTools.Method(typeof(BlueprintTweaks), nameof(PatchUpdateGrid))));
+        selectObjIdsField = AccessTools.Field(classTypeDragRemoveBuildTool, "selectObjIds");
+        harmony.Patch(AccessTools.Method(classTypeDragRemoveBuildTool, "DeterminePreviews"),
             new HarmonyMethod(AccessTools.Method(typeof(BlueprintTweaks), nameof(PatchDeterminePreviews))));
         return true;
     }
 
-    public static void PatchDeterminePreviews(object __instance)
+    private static readonly int zMin = Shader.PropertyToID("_ZMin");
+    private static readonly int reformMode = Shader.PropertyToID("_ReformMode");
+
+    private static IEnumerable<CodeInstruction> PatchUpdateGrid(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
+    {
+        var matcher = new CodeMatcher(instructions, generator);
+        matcher.MatchForward(false,
+            new CodeMatch(OpCodes.Ldsfld, AccessTools.Field(classTypeBlueprintTweaksPlugin, "tool")),
+            new CodeMatch(OpCodes.Ldfld),
+            new CodeMatch(ci => ci.opcode == OpCodes.Brfalse || ci.opcode == OpCodes.Brfalse_S)
+        );
+        var label1 = generator.DefineLabel();
+        matcher.Advance(2).Operand = label1;
+        matcher.Advance(1);
+        matcher.MatchForward(false,
+            new CodeMatch(OpCodes.Ldarg_0),
+            new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.blueprintMaterial))),
+            new CodeMatch(OpCodes.Ldsfld, AccessTools.Field(classTypeUIBuildingGridPatch2, "tintColor")),
+            new CodeMatch(OpCodes.Call),
+            new CodeMatch(OpCodes.Callvirt)
+        ).RemoveInstructions(5);
+        matcher.MatchForward(false,
+            new CodeMatch(OpCodes.Ldarg_0),
+            new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.blueprintMaterial))),
+            new CodeMatch(OpCodes.Ldsfld, AccessTools.Field(classTypeUIBuildingGridPatch2, "cursorGratBox")),
+            new CodeMatch(OpCodes.Ldsfld),
+            new CodeMatch(OpCodes.Ldfld),
+            new CodeMatch(OpCodes.Call),
+            new CodeMatch(OpCodes.Callvirt)
+        ).Advance(1).Operand = AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.material));
+        matcher.Advance(6);
+        matcher.MatchForward(false,
+            new CodeMatch(OpCodes.Ldarg_0),
+            new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.blueprintMaterial))),
+            new CodeMatch(OpCodes.Ldsfld, AccessTools.Field(classTypeUIBuildingGridPatch2, "selectColor")),
+            new CodeMatch(OpCodes.Ldarg_0),
+            new CodeMatch(OpCodes.Ldfld),
+            new CodeMatch(OpCodes.Call),
+            new CodeMatch(OpCodes.Callvirt)
+        ).Advance(1).Operand = AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.material));
+        matcher.Advance(1).Operand = AccessTools.Field(classTypeUIBuildingGridPatch2, "tintColor");
+        matcher.Advance(5);
+        matcher.MatchForward(false,
+            new CodeMatch(OpCodes.Ldarg_0),
+            new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.blueprintMaterial))),
+            new CodeMatch(OpCodes.Ldsfld, AccessTools.Field(classTypeUIBuildingGridPatch2, "showDivideLine")),
+            new CodeMatch(OpCodes.Ldc_R4, 0f),
+            new CodeMatch(OpCodes.Callvirt)
+        ).RemoveInstructions(5);
+        matcher.InsertAndAdvance(new CodeInstruction(OpCodes.Ldarg_0),
+            Transpilers.EmitDelegate((UIBuildingGrid grid) => {
+                grid.material.SetFloat(reformMode, 0f);
+                grid.material.SetFloat(zMin, -0.5f);
+            })
+        );
+        matcher.MatchForward(false,
+            new CodeMatch(OpCodes.Ldarg_0),
+            new CodeMatch(OpCodes.Ldfld, AccessTools.Field(typeof(UIBuildingGrid), nameof(UIBuildingGrid.blueprintGridRnd))),
+            new CodeMatch(OpCodes.Ldc_I4_1),
+            new CodeMatch(OpCodes.Callvirt),
+            new CodeMatch(ci => ci.opcode == OpCodes.Br || ci.opcode == OpCodes.Br_S)
+        ).RemoveInstructions(4).Set(OpCodes.Ret, null).Labels.Add(label1);
+        return matcher.InstructionEnumeration();
+    }
+
+    private static void PatchDeterminePreviews(object __instance)
     {
         var selectObjIds = (HashSet<int>)selectObjIdsField.GetValue(__instance);
         var buildTool = (BuildTool)__instance;

UXAssist/Patches/FactoryPatch.cs

@@ -2337,42 +2337,22 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
             if (belt.id != entityData.beltId) return;
 
             HashSet<int> pathIds = [belt.segPathId];
-            if (PressShiftToTakeWholeBeltItemsIncludeBranches.Value)
-            {
-                List<int> pendingPathIds = [belt.segPathId];
-                while (pendingPathIds.Count > 0)
-                {
-                    var lastIndex = pendingPathIds.Count - 1;
-                    var thisPathId = pendingPathIds[lastIndex];
-                    pendingPathIds.RemoveAt(lastIndex);
-                    var path = cargoTraffic.GetCargoPath(thisPathId);
-                    if (path == null) continue;
-                    foreach (var inputPathId in path.inputPaths)
-                    {
-                        if (pathIds.Contains(inputPathId)) continue;
-                        pathIds.Add(inputPathId);
-                        pendingPathIds.Add(inputPathId);
-                    }
-                    if (path.outputPath == null) continue;
-                    var outputPathId = path.outputPath.id;
-                    if (pathIds.Contains(outputPathId)) continue;
-                    pathIds.Add(outputPathId);
-                    pendingPathIds.Add(outputPathId);
-                }
-            }
-
-            var mainPlayer = factory.gameData.mainPlayer;
-            var factorySystem = factory.factorySystem;
+            HashSet<int> inserterIds = [];
+            var includeBranches = PressShiftToTakeWholeBeltItemsIncludeBranches.Value;
+            var includeInserters = PressShiftToTakeWholeBeltItemsIncludeInserters.Value;
+            List<int> pendingPathIds = [belt.segPathId];
             Dictionary<int, long> takeOutItems = [];
-            foreach (var pathId in pathIds)
+            var factorySystem = factory.factorySystem;
+            while (pendingPathIds.Count > 0)
             {
-                var cargoPath = cargoTraffic.GetCargoPath(pathId);
-                if (cargoPath == null) continue;
-                var end = cargoPath.bufferLength - 5;
-                var buffer = cargoPath.buffer;
-                if (PressShiftToTakeWholeBeltItemsIncludeInserters.Value)
+                var lastIndex = pendingPathIds.Count - 1;
+                var thisPathId = pendingPathIds[lastIndex];
+                pendingPathIds.RemoveAt(lastIndex);
+                var path = cargoTraffic.GetCargoPath(thisPathId);
+                if (path == null) continue;
+                if (includeInserters)
                 {
-                    foreach (var beltId in cargoPath.belts)
+                    foreach (var beltId in path.belts)
                     {
                         ref var b = ref cargoTraffic.beltPool[beltId];
                         if (b.id != beltId) return;
@@ -2385,18 +2365,62 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                             if (inserterId <= 0) continue;
                             ref var inserter = ref factorySystem.inserterPool[inserterId];
                             if (inserter.id != inserterId) continue;
-                            if (inserter.itemId > 0 && inserter.stackCount > 0)
+                            inserterIds.Add(inserterId);
+                            if (includeBranches)
                             {
-                                takeOutItems[inserter.itemId] = (takeOutItems.TryGetValue(inserter.itemId, out var value) ? value : 0)
-                                    + ((long)inserter.itemCount | ((long)inserter.itemInc << 32));
-                                inserter.itemId = 0;
-                                inserter.stackCount = 0;
-                                inserter.itemCount = 0;
-                                inserter.itemInc = 0;
+                                var pickTargetId = inserter.pickTarget;
+                                if (pickTargetId > 0)
+                                {
+                                    ref var pickTarget = ref factory.entityPool[pickTargetId];
+                                    if (pickTarget.id == pickTargetId && pickTarget.beltId > 0)
+                                    {
+                                        ref var pickTargetBelt = ref cargoTraffic.beltPool[pickTarget.beltId];
+                                        if (pickTargetBelt.id == pickTarget.beltId && !pathIds.Contains(pickTargetBelt.segPathId))
+                                        {
+                                            pathIds.Add(pickTargetBelt.segPathId);
+                                            pendingPathIds.Add(pickTargetBelt.segPathId);
+                                        }
+                                    }
+                                }
+                                var insertTargetId = inserter.insertTarget;
+                                if (insertTargetId > 0)
+                                {
+                                    ref var insertTarget = ref factory.entityPool[insertTargetId];
+                                    if (insertTarget.id == insertTargetId && insertTarget.beltId > 0)
+                                    {
+                                        ref var insertTargetBelt = ref cargoTraffic.beltPool[insertTarget.beltId];
+                                        if (insertTargetBelt.id == insertTarget.beltId && !pathIds.Contains(insertTargetBelt.segPathId))
+                                        {
+                                            pathIds.Add(insertTargetBelt.segPathId);
+                                            pendingPathIds.Add(insertTargetBelt.segPathId);
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
                 }
+                if (!includeBranches) continue;
+                foreach (var inputPathId in path.inputPaths)
+                {
+                    if (pathIds.Contains(inputPathId)) continue;
+                    pathIds.Add(inputPathId);
+                    pendingPathIds.Add(inputPathId);
+                }
+                if (path.outputPath == null) continue;
+                var outputPathId = path.outputPath.id;
+                if (pathIds.Contains(outputPathId)) continue;
+                pathIds.Add(outputPathId);
+                pendingPathIds.Add(outputPathId);
+            }
+
+            var mainPlayer = factory.gameData.mainPlayer;
+            foreach (var pathId in pathIds)
+            {
+                var cargoPath = cargoTraffic.GetCargoPath(pathId);
+                if (cargoPath == null) continue;
+                var end = cargoPath.bufferLength - 5;
+                var buffer = cargoPath.buffer;
                 for (var i = 0; i <= end;)
                 {
                     if (buffer[i] >= 246)
@@ -2425,6 +2449,19 @@ public class FactoryPatch : PatchImpl<FactoryPatch>
                     }
                 }
             }
+            foreach (var inserterId in inserterIds)
+            {
+                ref var inserter = ref factorySystem.inserterPool[inserterId];
+                if (inserter.itemId > 0 && inserter.stackCount > 0)
+                {
+                    takeOutItems[inserter.itemId] = (takeOutItems.TryGetValue(inserter.itemId, out var value) ? value : 0)
+                            + ((long)inserter.itemCount | ((long)inserter.itemInc << 32));
+                    inserter.itemId = 0;
+                    inserter.stackCount = 0;
+                    inserter.itemCount = 0;
+                    inserter.itemInc = 0;
+                }
+            }
             foreach (var kvp in takeOutItems)
             {
                 var added = mainPlayer.TryAddItemToPackage(kvp.Key, (int)(kvp.Value & 0xFFFFFFFF), (int)(kvp.Value >> 32), true, entityId);

UXAssist/UIConfigWindow.cs

@@ -71,6 +71,9 @@ public static class UIConfigWindow
         I18N.Add("Drag building power poles in maximum connection range", "Drag building power poles in maximum connection range", "拖动建造电线杆时自动使用最大连接距离间隔");
         I18N.Add("Build Tesla Tower and Wireless Power Tower alternately", "Build Tesla Tower and Wireless Power Tower alternately", "交替建造电力感应塔和无线输电塔");
         I18N.Add("Belt signals for buy out dark fog items automatically", "Belt signals for buy out dark fog items automatically", "用于自动购买黑雾物品的传送带信号");
+        I18N.Add("Ctrl+Shift+Click to pick items from whole belts", "Ctrl+Shift+Click to pick items from whole belts", "按住Ctrl+Shift点击从整条传送带抓取物品");
+        I18N.Add("Include branches of belts", "Include branches of belts", "包含传送带分支");
+        I18N.Add("Include connected inserters", "Include connected inserters (and their connected belts if above is checked)", "包含连接的分拣器(若勾选上面的选项则包含分拣器连接的传送带)");
         I18N.Add("Auto-config logistic stations", "Auto-config logistic stations", "自动配置物流设施");
         I18N.Add("Limit auto-replenish count to values below", "Limit auto-replenish count to values below", "限制自动补充数量为下面配置的值");
         I18N.Add("Dispenser", "Logistics Distributor", "物流配送器");
@@ -404,6 +407,24 @@ public static class UIConfigWindow
             }
         }
 
+        {
+            y += 36f;
+            wnd.AddCheckBox(x, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled, "Ctrl+Shift+Click to pick items from whole belts");
+            y += 27f;
+            var includeBranches = wnd.AddCheckBox(x + 10, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches, "Include branches of belts", 13);
+            y += 27f;
+            var includeInserters = wnd.AddCheckBox(x + 10, y, tab2, FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters, "Include connected inserters", 13);
+            FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.SettingChanged += PressShiftToTakeWholeBeltItemsEnabledChanged;
+            wnd.OnFree += () => { FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.SettingChanged -= PressShiftToTakeWholeBeltItemsEnabledChanged; };
+            PressShiftToTakeWholeBeltItemsEnabledChanged(null, null);
+
+            void PressShiftToTakeWholeBeltItemsEnabledChanged(object o, EventArgs e)
+            {   
+                includeBranches.SetEnable(FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.Value);
+                includeInserters.SetEnable(FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled.Value);
+            }
+        }
+
         x = 400f;
         y = 10f;
         wnd.AddButton(x, y, tab2, "Initialize This Planet", 16, "button-init-planet", () =>
@@ -470,7 +491,6 @@ public static class UIConfigWindow
             FactoryPatch.TweakBuildingBufferEnabled.SettingChanged += TweakBuildingBufferChanged;
             wnd.OnFree += () => { FactoryPatch.TweakBuildingBufferEnabled.SettingChanged -= TweakBuildingBufferChanged; };
             TweakBuildingBufferChanged(null, null);
-
             void TweakBuildingBufferChanged(object o, EventArgs e)
             {
                 assemblerBufferTimeMultiplierSlider.SetEnable(FactoryPatch.TweakBuildingBufferEnabled.Value);
@@ -606,7 +626,7 @@ public static class UIConfigWindow
         textForMeasureTextWidth = wnd.AddText2(x, y, tab3, "Min. Piler Value", 13, "text-amm-min-piler-value");
         maxWidth = Mathf.Max(maxWidth, textForMeasureTextWidth.preferredWidth);
         y = oy + 1;
-        var nx = x + maxWidth + 5f;
+        var nx = x + maxWidth + 5f + 10f;
         wnd.AddSideSlider(nx, y, tab3, LogisticsPatch.AutoConfigDispenserChargePower, new AutoConfigDispenserChargePowerMapper(), "G", 150f, -100f).WithFontSize(13);
         y += 18f;
         wnd.AddSideSlider(nx, y, tab3, LogisticsPatch.AutoConfigDispenserCourierCount, new MyWindow.RangeValueMapper<int>(0, 10), "G", 150f, -100f).WithFontSize(13);

UXAssist/UXAssist.cs

@@ -141,11 +141,11 @@ public class UXAssist : BaseUnityPlugin, IModCanSave
         FactoryPatch.ShortcutKeysForBlueprintCopyEnabled = Config.Bind("Factory", "DismantleBlueprintSelection", false,
             "Dismantle blueprint selected buildings");
         FactoryPatch.PressShiftToTakeWholeBeltItemsEnabled = Config.Bind("Factory", "PressShiftToTakeWholeBeltItems", false,
-            "Press Ctrl+Shift to take items from whole belts");
-        FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeBranches", true,
-            "Press Ctrl+Shift to take items from whole belts: Include branches");
-        FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeInserters", true,
-            "Press Ctrl+Shift to take items from whole belts: Include inserters");
+            "Ctrl+Shift+Click to pick items from whole belts");
+        FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeBranches = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeBranches", false,
+            "Include branches of belts");
+        FactoryPatch.PressShiftToTakeWholeBeltItemsIncludeInserters = Config.Bind("Factory", "PressShiftToTakeWholeBeltItemsIncludeInserters", false,
+            "Include connected inserters");
         LogisticsPatch.AutoConfigLogisticsEnabled = Config.Bind("Factory", "AutoConfigLogistics", false,
             "Auto-config logistic stations");
         LogisticsPatch.AutoConfigLimitAutoReplenishCount = Config.Bind("Factory", "AutoConfigLimitAutoReplenishCount", false,

UXAssist/UXAssist.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net472</TargetFramework>
     <BepInExPluginGuid>org.soardev.uxassist</BepInExPluginGuid>
     <Description>DSP MOD - UXAssist</Description>
-    <Version>1.4.4</Version>
+    <Version>1.4.5</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <LangVersion>latest</LangVersion>
     <PackageId>UXAssist</PackageId>

UXAssist/package/manifest.json

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