v2 - Use BuildOperation instead of global keybinding with ray casting

DLatchPoke/DLatchPoke.csproj

@@ -35,18 +35,15 @@
         <Reference Include="LogicWorld.BuildingManagement">
             <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.BuildingManagement.dll</HintPath>
         </Reference>
-        <Reference Include="LogicWorld.Players">
-            <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.Players.dll</HintPath>
-        </Reference>
-        <Reference Include="LogicWorld.Physics">
-            <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.Physics.dll</HintPath>
-        </Reference>
         <Reference Include="LogicWorld.Interfaces">
             <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.Interfaces.dll</HintPath>
         </Reference>
         <Reference Include="LogicWorld.Modding">
             <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.Modding.dll</HintPath>
         </Reference>
+        <Reference Include="LogicWorld.GameStates">
+            <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.GameStates.dll</HintPath>
+        </Reference>
         <Reference Include="LogicWorld.SharedCode">
             <HintPath>$(LogicWorldGameLocation)\Logic_World_Data\Managed\LogicWorld.SharedCode.dll</HintPath>
         </Reference>
@@ -69,7 +66,4 @@
     <ItemGroup>
         <ProjectReference Include="..\EccsLogicWorldAPI\EccsLogicWorldAPI.csproj"/>
     </ItemGroup>
-    <ItemGroup>
-      <Folder Include="src\shared\" />
-    </ItemGroup>
 </Project>

DLatchPoke/DLatchPoke/languages/English/English_input.jecs

@@ -1,6 +1,6 @@
 MHG.SettingsMenu.Pages.Controls.Headings.DLatchPoke: "Mod: DLatch Poke"
 
-FancyInput.Trigger.DLatchPoke.Poke: "Poke a DLatch"
+FancyInput.Trigger.DLatchPoke.Poke: "Toggle DLatch State"
 FancyInput.Trigger.DLatchPoke.Poke.Description: """
-    Toggles the internal state of the DLatch the player is looking at.
+    Toggles the internal state of the DLatch (or multiple) the player is looking at or has selected.
     """

DLatchPoke/DLatchPoke/manifest.jecs

@@ -1,7 +1,7 @@
 ID: D4VID_DLatchPoke
 Name: DLatch Poke
 Author: D4VID
-Version: 1.0.0
+Version: 2.0.0
 Priority: 0
 Dependencies:
   - EccsLogicWorldAPI

DLatchPoke/DLatchPoke/src/client/DLatchPokeClient.cs

@@ -1,17 +1,9 @@
-using System;
-using DLatchPoke.Client.Keybindings;
+using DLatchPoke.Client.Keybindings;
 using DLatchPoke.Client.Network;
-using DLatchPoke.Shared.Packets.C2S;
-using DLatchPoke.Shared.Packets.S2C;
 using EccsLogicWorldAPI.Client.Injectors;
 using FancyInput;
 using LogicAPI.Client;
-using LogicAPI.Data;
 using LogicLog;
-using LogicWorld;
-using LogicWorld.Interfaces;
-using LogicWorld.Physics;
-using LogicWorld.Players;
 
 namespace DLatchPoke.Client {
     public class DLatchPokeClient : ClientMod {
@@ -25,42 +17,10 @@ namespace DLatchPoke.Client {
             // Register keybindings in the settings menu
             CustomInput.Register<DLatchPokeContext, DLatchPokeTrigger>("DLatchPoke");
 
-            // Register the keybinding to enter the path analyzer game state
-            FirstPersonInteraction.RegisterBuildingKeybinding(DLatchPokeTrigger.Poke, () => {
-                    if (!ServerSupportsMod) {
-                        Logger.Error("Server does not support this mod");
-                        return false;
-                    }
-
-                    return PokeDLatch();
-                }
-            );
-
             // Inject packet handlers
             RawPacketHandlerInjector.addPacketHandler(new AnnounceModPacketHandler(Manifest.Version));
 
             Logger.Info("DLatchPoke mod loaded");
         }
-
-        private bool PokeDLatch() {
-            HitInfo hitInfo = PlayerCaster.CameraCast(Masks.Environment | Masks.Structure | Masks.Peg);
-            if (!hitInfo.HitSomething) {
-                return false;
-            }
-
-            ComponentAddress componentAddress;
-            if (hitInfo.HitComponent) {
-                componentAddress = hitInfo.cAddress;
-            } else if (hitInfo.HitPeg) {
-                componentAddress = hitInfo.pAddress.ComponentAddress;
-            } else {
-                return false;
-            }
-
-            Instances.SendData.Send(new DLatchPokeRequest() {
-                ComponentAddress = componentAddress,
-            });
-            return true;
-        }
     }
 }

DLatchPoke/DLatchPoke/src/client/DLatchPokeOperation.cs

@@ -0,0 +1,37 @@
+using DLatchPoke.Client.Keybindings;
+using DLatchPoke.Shared.Packets.C2S;
+using FancyInput;
+using LogicAPI.Data;
+using LogicAPI.Services;
+using LogicWorld.Building.Overhaul;
+using LogicWorld.GameStates;
+using LogicWorld.Interfaces;
+
+namespace DLatchPoke.Client {
+    public class DLatchPokeOperation : BuildingOperation {
+        public override string IconHexCode => "f363";
+        
+        public override bool CanOperateOn(ComponentSelection selection) {
+            if (!DLatchPokeClient.ServerSupportsMod) {
+                DLatchPokeClient.Logger.Error("Server does not support this mod");
+                return false;
+            }
+            ComponentType dLatchType = Instances.MainWorld.ComponentTypes.GetComponentType("MHG.DLatch");
+            foreach (ComponentAddress componentAddress in selection) {
+                if (Instances.MainWorld.Data.Lookup(componentAddress).Data.Type != dLatchType) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public override void BeginOperationOn(ComponentSelection selection) {
+            Instances.SendData.Send(new DLatchPokeRequest() {
+                ComponentAddresses = selection.ComponentsInSelection,
+            });
+            GameStateManager.TransitionBackToBuildingState();
+        }
+
+        public override InputTrigger OperationStarter => DLatchPokeTrigger.Poke;
+    }
+}

DLatchPoke/DLatchPoke/src/client/keybindings/DLatchPokeContext.cs

@@ -1,6 +1,6 @@
 namespace DLatchPoke.Client.Keybindings {
     public enum DLatchPokeContext {
-        None,
+        None = 0,
         DLatchPoke,
     }
 }

DLatchPoke/DLatchPoke/src/client/keybindings/DLatchPokeTrigger.cs

@@ -1,7 +1,7 @@
 namespace DLatchPoke.Client.Keybindings {
     // Define all available keybindings of the mod
     public enum DLatchPokeTrigger {
-        None,
+        None = 0,
         Poke,
     }
 }

DLatchPoke/DLatchPoke/src/server/DLatchPokeServer.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using DLatchPoke.Server.Network;
@@ -7,7 +6,6 @@ using EccsLogicWorldAPI.Server;
 using EccsLogicWorldAPI.Server.Injectors;
 using EccsLogicWorldAPI.Shared.PacketWrapper;
 using LogicAPI.Data;
-using LogicAPI.Networking;
 using LogicAPI.Networking.Packets.Initialization;
 using LogicAPI.Server;
 using LogicAPI.Server.Components;
@@ -31,9 +29,6 @@ namespace DLatchPoke.Server {
             Logger.Info("DLatchPoke server mod loading");
 
             _networkServer = ServiceGetter.getService<NetworkServer>();
-            if (_networkServer == null) {
-                throw new Exception("Could not get Service 'NetworkServer'.");
-            }
 
             // Inject client verifier:
             RawJoinVerifierInjector.addVerifier(this);
@@ -53,7 +48,6 @@ namespace DLatchPoke.Server {
             bool hasMod = ctx.ApprovalPacket.ClientMods.Contains(Manifest.ID);
             string playerName = ctx.PlayerID.Name;
             _playerHasMod[playerName] = hasMod;
-            Logger.Info($"Verifying player {playerName}: hasMod={hasMod}");
         }
 
         /// <summary>
@@ -73,8 +67,7 @@ namespace DLatchPoke.Server {
         /// Gets called from the DLatchPokeRequestHandler.
         /// Toggle the internal state of the DLatch
         /// </summary>
-        public void PokeDLatch(Connection sender, ComponentAddress componentAddress) {
-            Logger.Info("Got Poke DLatch request");
+        public void PokeDLatch(ComponentAddress componentAddress) {
             LogicComponent component = _circuits.LookupComponent(componentAddress);
             if (component == null) {
                 return;
@@ -82,7 +75,6 @@ namespace DLatchPoke.Server {
 
             DLatch dLatch = component as DLatch;
             if (dLatch == null) { // the component is not of type DLatch
-                Logger.Info("Poke target is not a DLatch");
                 return;
             }
             

DLatchPoke/DLatchPoke/src/server/network/DLatchPokeRequestHandler.cs

@@ -1,15 +1,19 @@
 using DLatchPoke.Shared.Packets.C2S;
+using LogicAPI.Data;
 using LogicWorld.SharedCode.Networking;
 
 namespace DLatchPoke.Server.Network {
     public class DLatchPokeRequestHandler : PacketHandler<DLatchPokeRequest> {
         private readonly DLatchPokeServer _dLatchPokeServer;
+
         public DLatchPokeRequestHandler(DLatchPokeServer dLatchPokeServer) {
             _dLatchPokeServer = dLatchPokeServer;
         }
 
         public override void Handle(DLatchPokeRequest packet, HandlerContext context) {
-            _dLatchPokeServer.PokeDLatch(context.Sender, packet.ComponentAddress);
+            foreach (ComponentAddress componentAddress in packet.ComponentAddresses) {
+                _dLatchPokeServer.PokeDLatch(componentAddress);
+            }
         }
     }
 }

DLatchPoke/DLatchPoke/src/shared/packets/c2s/DLatchPokeRequest.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using LogicAPI.Data;
 using LogicAPI.Networking.Packets;
 using MessagePack;
@@ -5,6 +6,6 @@ using MessagePack;
 namespace DLatchPoke.Shared.Packets.C2S {
     [MessagePackObject]
     public class DLatchPokeRequest : Packet {
-        [Key(0)] public ComponentAddress ComponentAddress;
+        [Key(0)] public IEnumerable<ComponentAddress> ComponentAddresses;
     }
 }