Fix lot of wire entities not calling WireLib.Remove on remove

lua/entities/base_wire_entity.lua

@@ -456,10 +456,6 @@ if SERVER then
 	end
 end
 
-function ENT:OnRemove()
-	WireLib.Remove(self)
-end
-
 function ENT:OnRestore()
 	WireLib.Restored(self)
 end

lua/entities/gmod_wire_adv_emarker.lua

@@ -119,6 +119,7 @@ end
 
 function ENT:OnRemove()
 	self:ClearEntities()
+	BaseClass.OnRemove(self)
 end
 
 function ENT:BuildDupeInfo()

lua/entities/gmod_wire_buoyancy.lua

@@ -117,6 +117,7 @@ end
 
 function ENT:OnRemove()
 	self:ClearEntities()
+	BaseClass.OnRemove(self)
 end
 
 function ENT:BuildDupeInfo()

lua/entities/gmod_wire_cameracontroller.lua

@@ -675,6 +675,7 @@ function ENT:OnRemove()
 	end
 
 	self:ClearEntities()
+	BaseClass.OnRemove(self)
 end
 
 --------------------------------------------------

lua/entities/gmod_wire_characterlcd/cl_init.lua

@@ -1,5 +1,6 @@
 include("shared.lua")
 
+DEFINE_BASECLASS("base_wire_entity")
 
 function ENT:Initialize()
 	local mem = {}
@@ -119,6 +120,7 @@ end
 
 function ENT:OnRemove()
 	self.GPU:Finalize()
+	BaseClass.OnRemove(self)
 end
 
 function ENT:ReadCell(Address,value)

lua/entities/gmod_wire_clutch.lua

@@ -148,6 +148,8 @@ function ENT:OnRemove()
 	for k in pairs( self.clutch_ballsockets ) do
 		self:RemoveClutch( k )
 	end
+
+	BaseClass.OnRemove(self)
 end
 
 

lua/entities/gmod_wire_consolescreen/cl_init.lua

@@ -1,5 +1,7 @@
 include("shared.lua")
 
+DEFINE_BASECLASS("base_wire_entity")
+
 function ENT:SendData()
 	net.Start("wire_interactiveprop_action")
 
@@ -134,6 +136,7 @@ end
 function ENT:OnRemove()
 	self.GPU:Finalize()
 	self.NeedRefresh = true
+	BaseClass.OnRemove(self)
 end
 
 function ENT:ReadCell(Address,value)
@@ -729,6 +732,3 @@ end
 function ENT:IsTranslucent()
 	return true
 end
-
-
-

lua/entities/gmod_wire_datasocket.lua

@@ -39,6 +39,8 @@ if CLIENT then
 		if #sockets == 0 then
 			hook.Remove("HUDPaint", "Wire_DataSocket_DrawLinkHelperLine")
 		end
+
+		BaseClass.OnRemove(self)
 	end
 
 	return

lua/entities/gmod_wire_digitalscreen/cl_init.lua

@@ -1,6 +1,6 @@
 include("shared.lua")
 
-
+DEFINE_BASECLASS("base_wire_entity")
 
 function ENT:SendData()
 	net.Start("wire_interactiveprop_action")
@@ -78,6 +78,7 @@ end
 function ENT:OnRemove()
 	self.GPU:Finalize()
 	self.NeedRefresh = true
+	BaseClass.OnRemove(self)
 end
 
 local function stringToNumber(index, str, bytes)

lua/entities/gmod_wire_egp/cl_init.lua

@@ -1,5 +1,6 @@
 include('shared.lua')
 
+DEFINE_BASECLASS("base_wire_entity")
 ENT.gmod_wire_egp = true
 
 function ENT:Initialize()
@@ -49,4 +50,5 @@ end
 
 function ENT:OnRemove()
 	self.GPU:Finalize()
+	BaseClass.OnRemove(self)
 end

lua/entities/gmod_wire_egp_emitter.lua

@@ -171,6 +171,7 @@ if CLIENT then
 
 	function ENT:OnRemove()
 		if self.GPU then self.GPU:Finalize() end
+		BaseClass.OnRemove(self)
 	end
 end
 

lua/entities/gmod_wire_egp_hud/init.lua

@@ -91,6 +91,7 @@ end
 
 function ENT:OnRemove()
 	EGP:UnlinkHUDFromVehicle( self )
+	BaseClass.OnRemove(self)
 end
 
 function ENT:BuildDupeInfo()

lua/entities/gmod_wire_emarker.lua

@@ -54,6 +54,8 @@ function ENT:OnRemove()
 		self.Mark:RemoveCallOnRemove("EMarker.UnLink" .. self:EntIndex())
 		self.Mark = nil
 	end
+
+	BaseClass.OnRemove(self)
 end
 
 function ENT:BuildDupeInfo()

lua/entities/gmod_wire_eyepod.lua

@@ -249,6 +249,7 @@ end)
 
 function ENT:OnRemove()
 	self:UnlinkEnt()
+	BaseClass.OnRemove(self)
 end
 
 local function AngNorm(Ang)

lua/entities/gmod_wire_freezer.lua

@@ -135,6 +135,7 @@ end
 
 function ENT:OnRemove()
 	self:ClearEntities()
+	BaseClass.OnRemove(self)
 end
 
 function ENT:BuildDupeInfo()

lua/entities/gmod_wire_gpu/cl_init.lua

@@ -1,6 +1,7 @@
 include("cl_gpuvm.lua")
 include("shared.lua")
 
+DEFINE_BASECLASS("base_wire_entity")
 local Monitors = {}
 local MonitorLookup = {}
 local HUDLookup = {}
@@ -134,6 +135,7 @@ function ENT:OnRemove()
   GPULib.ClientCacheCallback(self,nil)
   self.GPU:Finalize()
   if self.SpriteGPU then self.SpriteGPU:Finalize() end
+  BaseClass.OnRemove(self)
 end
 
 

lua/entities/gmod_wire_grabber.lua

@@ -31,7 +31,7 @@ function ENT:OnRemove()
 	if self.Weld then
 		self:ResetGrab()
 	end
-	Wire_Remove(self)
+	BaseClass.OnRemove(self)
 end
 
 function ENT:Setup(Range, Gravity)

lua/entities/gmod_wire_graphics_tablet.lua

@@ -7,7 +7,7 @@
 
 ENT.workingDistance = 64
 
 local SCREEN_CURSOR = false -- (0, 0) is top left, (1, 1) is bottom right
 local GRAPH_CURSOR = true -- (0, 0) is center, (1, 1) is top right
 
 function ENT:SetupDataTables()
@@ -24,6 +24,7 @@
 
 	function ENT:OnRemove()
 		self.GPU:Finalize()
+		BaseClass.OnRemove(self)
 	end
 
 	local function cut_rect(x1,y1,w1,h1,x2,y2,w2,h2)
@@ -36,7 +37,7 @@
 	function ENT:Draw(flags)
 		self:DrawModel(flags)
 
 		local draw_background = self:GetDrawBackground()
 		self.GPU:RenderToWorld(nil, 512, function(x, y, w, h, monitor, pos, ang, res)
 			if draw_background then
 				surface.SetDrawColor(0, 0, 0, 255)
@@ -110,8 +111,8 @@
 	local pos = GPUEntity:LocalToWorld(monitor.offset)
 	local h = 1024
 	local w = h/monitor.RatioX
 	local x = -w/2
 	local y = -h/2
 
 	for _,ply in player.Iterator() do
 		local trace = ply:GetEyeTraceNoCursor()

lua/entities/gmod_wire_hdd.lua

@@ -9,6 +9,8 @@ function ENT:OnRemove()
 	for k,v in pairs(self.CacheUpdated) do
 		file.Write(self:GetStructName(k),self:MakeFloatTable(self.Cache[k]))
 	end
+
+	BaseClass.OnRemove(self)
 end
 
 function ENT:Initialize()

lua/entities/gmod_wire_interactiveprop.lua

@@ -424,6 +424,7 @@ end
 
 function ENT:OnRemove()
 	self:Unprompt( true )
+	BaseClass.OnRemove(self)
 end
 
 

lua/entities/gmod_wire_lamp.lua

@@ -144,13 +144,15 @@
 			self.LastLampMatrix = nil
 			self.LastLampColor = nil
 		end
+
+		BaseClass.OnRemove(self)
 	end
 
 	return
 end
 
 function ENT:TriggerInput(name, value)
 	local color = self:GetColor()
 
 	if name == "On" then
 		self:SetOn(value ~= 0)

lua/entities/gmod_wire_latch.lua

@@ -133,6 +133,7 @@ end
 function ENT:OnRemove()
 	self:TriggerInput("Activate", 0)
 	self:TriggerInput("NoCollide", 0)
+	BaseClass.OnRemove(self)
 end
 
 function ENT:UpdateOverlay()

lua/entities/gmod_wire_numpad.lua

@@ -108,6 +108,8 @@ function ENT:OnRemove()
 	for _,impulse in ipairs(self.impulses) do
 		numpad.Remove(impulse)
 	end
+
+	BaseClass.OnRemove(self)
 end
 
 local function On( pl, ent, key )

lua/entities/gmod_wire_oscilloscope.lua

@@ -49,6 +49,7 @@ if CLIENT then
 
 	function ENT:OnRemove()
 		self.GPU:Finalize()
+		BaseClass.OnRemove(self)
 	end
 
 	function ENT:GetNodeList()

lua/entities/gmod_wire_pod.lua

@@ -268,6 +268,7 @@ function ENT:OnRemove()
 		hook.Remove("PlayerLeaveVehicle", "Wire_Pod_ExitVehicle")
 		hook.Remove("CanExitVehicle","Wire_Pod_CanExitVehicle")
 	end
+	BaseClass.OnRemove(self)
 end
 
 function ENT:GetPod()

lua/entities/gmod_wire_rt_camera.lua

@@ -1,6 +1,6 @@
 AddCSLuaFile()
-ENT.Base = "base_wire_entity"
-ENT.Type = "anim"
+
+DEFINE_BASECLASS("base_wire_entity")
 ENT.PrintName = "Improved RT Camera"
 ENT.WireDebugName = "Improved RT Camera"
 
@@ -89,6 +89,8 @@
         if not fullUpdate then
             SetCameraActive(self, false)
         end
+
+        BaseClass.OnRemove(self)
     end
 
     function ENT:SetIsObserved(isObserved)
@@ -172,7 +174,7 @@
         local renderedCameras = 0
 
         for _, ent in ipairs(ActiveCameras) do
             if not IsValid(ent) or not ent.IsObserved then goto next_camera end
             renderedCameras = renderedCameras + 1
 
             render.PushRenderTarget(ent.RenderTarget)

lua/entities/gmod_wire_rt_screen.lua

@@ -1,7 +1,6 @@
 AddCSLuaFile()
 
-ENT.Type = "anim"
-ENT.Base = "base_wire_entity"
+DEFINE_BASECLASS("base_wire_entity")
 ENT.PrintName = "Improved RT Screen"
 ENT.WireDebugName = "Improved RT Screen"
 
@@ -131,6 +130,7 @@ if SERVER then
 		if #screens == 0 then
 			hook.Remove("SetupPlayerVisibility", "ImprovedRTCamera")
 		end
+        BaseClass.OnRemove(self)
 	end
 
 end

lua/entities/gmod_wire_screen.lua

@@ -38,6 +38,7 @@ if CLIENT then
 
 	function ENT:OnRemove()
 		self.GPU:Finalize()
+		BaseClass.OnRemove(self)
 	end
 
 	local large_font = "Trebuchet36"

lua/entities/gmod_wire_socket.lua

@@ -89,6 +89,7 @@ if CLIENT then
 		if #sockets == 0 then
 			hook.Remove("HUDPaint", "Wire_Socket_DrawLinkHelperLine")
 		end
+		BaseClass.OnRemove(self)
 	end
 
 	return  -- No more client

lua/entities/gmod_wire_spawner.lua

@@ -249,6 +249,7 @@ function ENT:OnRemove()
 	for _,ent in ipairs(self.UndoList) do
 		GlobalUndoList[ent] = nil
 	end
+	BaseClass.OnRemove(self)
 end
 
 duplicator.RegisterEntityClass("gmod_wire_spawner", WireLib.MakeWireEnt, "Data", "delay", "undo_delay", "spawn_effect", "mat", "r", "g", "b", "a", "skin")

lua/entities/gmod_wire_spu/cl_init.lua

@@ -1,7 +1,7 @@
 include("cl_spuvm.lua")
 include("shared.lua")
 
-
+DEFINE_BASECLASS("base_wire_entity")
 
 --------------------------------------------------------------------------------
 WireSPU_MaxChannels = 32
@@ -150,6 +150,7 @@ function ENT:OnRemove()
       v.Sound:Stop()
     end
   end
+  BaseClass.OnRemove(self)
 end
 
 

lua/entities/gmod_wire_spu/init.lua

@@ -51,7 +51,7 @@
     function()
       if not self:IsValid() then return end
 
       umsg.Start("wire_spu_soundsources")
         umsg.Long(self:EntIndex())
          for i=0,WireSPU_MaxChannels-1 do
            umsg.Long(self.SoundSources[i]:EntIndex())
@@ -69,6 +69,7 @@
   for i=0,WireSPU_MaxChannels-1 do
     self.SoundSources[i]:Remove()
   end
+  BaseClass.OnRemove(self)
 end
 
 
@@ -93,7 +94,7 @@
       function()
         if not self:IsValid() then return end
 
         umsg.Start("wire_spu_memorymodel")
           umsg.Long(self:EntIndex())
           umsg.Long (self.RAMSize)
           umsg.Float(self.SerialNo)
@@ -109,7 +110,7 @@
   function()
     if not self:IsValid() then return end
 
     umsg.Start("wire_spu_extensions")
       umsg.Long(self:EntIndex())
       umsg.String(self.ZVMExtensions)
     umsg.End()
@@ -336,7 +337,7 @@
 
     -- Send update to all clients
     if soundEmittersChanged then
       umsg.Start("wire_spu_soundstate")
         umsg.Long(self:EntIndex())
         umsg.Short(#self.SoundEmitters)
         for idx=1,#self.SoundEmitters do

lua/entities/gmod_wire_textentry.lua

@@ -167,6 +167,7 @@ function ENT:OnRemove()
 	self:RemoveHoldTimer()
 
 	self:Unprompt( true )
+	BaseClass.OnRemove(self)
 end
 
 ----------------------------------------------------
@@ -186,7 +187,7 @@ net.Receive("wire_textentry_action",function(len,ply)
 	if ok and not self.BlockInput then
 		self:OnTextEntered(text)
 
-		
+
 	end
 
 	self:UpdateOverlay()

lua/entities/gmod_wire_textreceiver.lua

@@ -72,6 +72,7 @@ end
 
 function ENT:OnRemove()
 	RemoveReceiver( self )
+	BaseClass.OnRemove(self)
 end
 
 local string_find = string.find

lua/entities/gmod_wire_textscreen.lua

@@ -136,6 +136,7 @@ if CLIENT then
 		self.NeedRefresh = true
 		if fullUpdate then return end
 		self.GPU:Finalize()
+		BaseClass.OnRemove(self)
 	end
 	function ENT:Draw(flags)
 		self:DrawModel(flags)

lua/entities/gmod_wire_waypoint.lua

@@ -96,6 +96,8 @@ function ENT:OnRemove()
 			ent:SetNextWaypoint(ent:GetNextWaypoint())
 		end
 	end
+
+	BaseClass.OnRemove(self)
 end
 
 duplicator.RegisterEntityClass("gmod_wire_waypoint", WireLib.MakeWireEnt, "Data", "range")