Refactor Button tool into BaseWireTool

code/tools/BaseWireTool.cs

@@ -0,0 +1,71 @@
+using System;
+namespace Sandbox.Tools
+{
+	public abstract partial class BaseWireTool : BaseTool
+	{
+		PreviewEntity previewModel;
+
+		abstract protected Type GetEntityType();
+		abstract protected string GetModel();
+		abstract protected ModelEntity SpawnEntity( TraceResult tr );
+
+		protected override bool IsPreviewTraceValid( TraceResult tr )
+		{
+			if ( !base.IsPreviewTraceValid( tr ) ) {
+				return false;
+			}
+			if ( tr.Entity.GetType().IsSubclassOf( GetEntityType() ) ) {
+				return false;
+			}
+
+			return true;
+		}
+
+		public override void CreatePreviews()
+		{
+			if ( TryCreatePreview( ref previewModel, GetModel() ) ) {
+				previewModel.RelativeToNormal = false;
+			}
+		}
+
+		public override void Simulate()
+		{
+			if ( !Host.IsServer ) {
+				return;
+			}
+
+			using ( Prediction.Off() ) {
+				var input = Owner.Input;
+
+				if ( !input.Pressed( InputButton.Attack1 ) )
+					return;
+
+				var startPos = Owner.EyePos;
+				var dir = Owner.EyeRot.Forward;
+
+				var tr = Trace.Ray( startPos, startPos + dir * MaxTraceDistance )
+					.Ignore( Owner )
+					.Run();
+
+				if ( !tr.Hit || !tr.Entity.IsValid() ) {
+					return;
+				}
+
+				CreateHitEffects( tr.EndPos );
+
+				if ( tr.Entity.GetType().IsSubclassOf( GetEntityType() ) ) {
+					return;
+				}
+
+				var ent = SpawnEntity( tr );
+				ent.SetModel( GetModel() );
+
+				var attachEnt = tr.Body.IsValid() ? tr.Body.Entity : tr.Entity;
+
+				if ( attachEnt.IsValid() ) {
+					ent.SetParent( tr.Body.Entity, tr.Body.PhysicsGroup.GetBodyBoneName( tr.Body ) );
+				}
+			}
+		}
+	}
+}

code/tools/Button.cs

@@ -2,69 +2,21 @@
 namespace Sandbox.Tools
 {
 	[Library( "tool_button", Title = "Button", Description = "Create Buttons!", Group = "construction" )]
-	public partial class ButtonTool : BaseTool
+	public partial class ButtonTool : BaseWireTool
 	{
-		PreviewEntity previewModel;
-
-		protected override bool IsPreviewTraceValid( TraceResult tr )
+		protected override Type GetEntityType()
 		{
-			if ( !base.IsPreviewTraceValid( tr ) )
-				return false;
-
-			if ( tr.Entity is ButtonEntity )
-				return false;
-
-			return true;
+			return typeof( ButtonEntity );
 		}
-
-		public override void CreatePreviews()
+		protected override string GetModel()
 		{
-			if ( TryCreatePreview( ref previewModel, "models/wirebox/katlatze/button.vmdl" ) ) {
-				previewModel.RelativeToNormal = false;
-			}
+			return "models/wirebox/katlatze/button.vmdl";
 		}
-
-		public override void Simulate()
+		protected override ModelEntity SpawnEntity( TraceResult tr )
 		{
-			if ( !Host.IsServer )
-				return;
-
-			using ( Prediction.Off() ) {
-				var input = Owner.Input;
-
-				if ( !input.Pressed( InputButton.Attack1 ) )
-					return;
-
-				var startPos = Owner.EyePos;
-				var dir = Owner.EyeRot.Forward;
-
-				var tr = Trace.Ray( startPos, startPos + dir * MaxTraceDistance )
-					.Ignore( Owner )
-					.Run();
-
-				if ( !tr.Hit )
-					return;
-
-				if ( !tr.Entity.IsValid() )
-					return;
-
-				CreateHitEffects( tr.EndPos );
-
-				if ( tr.Entity is ButtonEntity )
-					return;
-
-				var ent = new ButtonEntity {
-					Position = tr.EndPos,
-				};
-
-				ent.SetModel( "models/wirebox/katlatze/button.vmdl" );
-
-				var attachEnt = tr.Body.IsValid() ? tr.Body.Entity : tr.Entity;
-
-				if ( attachEnt.IsValid() ) {
-					ent.SetParent( tr.Body.Entity, tr.Body.PhysicsGroup.GetBodyBoneName( tr.Body ) );
-				}
-			}
+			return new ButtonEntity {
+				Position = tr.EndPos,
+			};
 		}
 	}
 }

code/tools/Wire.cs

@@ -41,6 +41,7 @@ public override void Simulate()
 						var outputName = wireOutputProp.GetOutputNames()[0];
 						var inputName = wireInputProp.GetInputNames()[0];
 
+						//Log.Info("Wiring " + wireInputProp + "'s " + inputName + " to " + wireOutputProp + "'s " + outputName);
 						wireOutputProp.WireConnect( wireInputProp, outputName, inputName );
 						WireOutputEntity.WireTriggerOutput( wireOutputProp, outputName, wireOutputProp.GetOutput( outputName ).value );
 						Reset();

models/wirebox/katlatze/button.vmdl

@@ -69,7 +69,7 @@
 				[
 					{
 						_class = "RenderMeshFile"
-						filename = "models/katlatze/button.fbx"
+						filename = "models/wirebox/katlatze/button.fbx"
 						import_translation = [ 0.0, 0.0, 0.0 ]
 						import_rotation = [ 0.0, 0.0, 0.0 ]
 						import_scale = 0.1
@@ -98,7 +98,7 @@
 						recenter_on_parent_bone = false
 						offset_origin = [ 0.0, 0.0, 0.0 ]
 						offset_angles = [ 0.0, 0.0, 0.0 ]
-						filename = "models/katlatze/button.fbx"
+						filename = "models/wirebox/katlatze/button.fbx"
 						import_scale = 0.1
 						faceMergeAngle = 10.0
 						maxHullVertices = 0

models/wirebox/katlatze/spoon.vmdl

@@ -61,7 +61,7 @@
 						recenter_on_parent_bone = false
 						offset_origin = [ 0.0, 0.0, 0.0 ]
 						offset_angles = [ 0.0, 0.0, 0.0 ]
-						filename = "models/katlatze/spoon.dmx"
+						filename = "models/wirebox/katlatze/spoon.dmx"
 						import_scale = 1.0
 						faceMergeAngle = 25.0
 						maxHullVertices = 0
@@ -81,7 +81,7 @@
 				[
 					{
 						_class = "RenderMeshFile"
-						filename = "models/katlatze/spoon.dmx"
+						filename = "models/wirebox/katlatze/spoon.dmx"
 						import_translation = [ 0.0, 0.0, 0.0 ]
 						import_rotation = [ 0.0, 0.0, 0.0 ]
 						import_scale = 1.0

unpack-assets.bat

@@ -1 +1 @@
-xcopy /E models\wirebox\ ..\..\..\models\wirebox\
+xcopy /E /Y models\wirebox\ ..\..\..\models\wirebox\