@quenty/ragdoll 9.27.2 → 9.28.0

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.28.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@9.27.2...@quenty/ragdoll@9.28.0) (2023-06-24)
+
+**Note:** Version bump only for package @quenty/ragdoll
+
+
+
+
+
 ## [9.27.2](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@9.27.1...@quenty/ragdoll@9.27.2) (2023-06-23)
 
 **Note:** Version bump only for package @quenty/ragdoll

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/ragdoll",
-  "version": "9.27.2",
+  "version": "9.28.0",
   "description": "Quenty's Ragdoll system for Roblox - Floppy fun ragdolls",
   "keywords": [
     "Roblox",
@@ -27,9 +27,9 @@
   "dependencies": {
     "@quenty/attributeutils": "^8.16.0",
     "@quenty/baseobject": "^6.2.1",
-    "@quenty/binder": "^8.18.1",
+    "@quenty/binder": "^8.19.0",
     "@quenty/brio": "^8.14.0",
-    "@quenty/camera": "^9.16.0",
+    "@quenty/camera": "^9.17.0",
     "@quenty/cancellabledelay": "^3.4.0",
     "@quenty/characterutils": "^6.8.0",
     "@quenty/draw": "^4.2.0",
@@ -38,14 +38,14 @@
     "@quenty/instanceutils": "^7.15.0",
     "@quenty/loader": "^6.2.1",
     "@quenty/maid": "^2.5.0",
-    "@quenty/motor6d": "^1.24.1",
-    "@quenty/playerhumanoidbinder": "^8.18.1",
+    "@quenty/motor6d": "^1.25.0",
+    "@quenty/playerhumanoidbinder": "^8.19.0",
     "@quenty/promise": "^6.6.0",
     "@quenty/qframe": "^6.9.0",
     "@quenty/r15utils": "^7.16.0",
     "@quenty/remoting": "^6.6.0",
     "@quenty/rx": "^7.12.0",
-    "@quenty/rxbinderutils": "^8.19.1",
+    "@quenty/rxbinderutils": "^8.20.0",
     "@quenty/spring": "^6.3.0",
     "@quenty/steputils": "^3.2.0",
     "@quenty/table": "^3.2.0",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "266132ea91226f356a7e19574593a8db18046cab"
+  "gitHead": "5d8f00296517b2a1aff2db540728f5e689a0c3e3"
 }

package/src/Client/Classes/RagdollClient.lua

@@ -1,7 +1,15 @@
 --[=[
-	Client side ragdolling meant to be used with a binder. See [RagdollBindersClient].
+	Client side ragdolling meant to be used with a binder. This class exports a [Binder].
 	While a humanoid is bound with this class, it is ragdolled.
 
+	:::tip
+	Initialize this whole system through [RagdollServiceClient].
+	:::
+
+	```
+	serviceBag:GetService(require("RagdollClient"))
+	```
+
 	@client
 	@class RagdollClient
 ]=]
@@ -14,21 +22,22 @@ local UserInputService = game:GetService("UserInputService")
 local RunService = game:GetService("RunService")
 
 local BaseObject = require("BaseObject")
+local Binder = require("Binder")
 local CameraStackService = require("CameraStackService")
 local CharacterUtils = require("CharacterUtils")
 local HapticFeedbackUtils = require("HapticFeedbackUtils")
-local RagdollServiceClient = require("RagdollServiceClient")
 local RagdollMotorUtils = require("RagdollMotorUtils")
-local RxR15Utils = require("RxR15Utils")
+local RagdollServiceClient = require("RagdollServiceClient")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
+local RxR15Utils = require("RxR15Utils")
 
 local RagdollClient = setmetatable({}, BaseObject)
 RagdollClient.ClassName = "RagdollClient"
 RagdollClient.__index = RagdollClient
 
 --[=[
-	Constructs a new RagdollClient. Should be done via [Binder]. See [RagdollBindersClient].
+	Constructs a new RagdollClient. This module exports a [Binder].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return RagdollClient
@@ -135,4 +144,4 @@ function RagdollClient:_setupHapticFeedback()
 	end)
 end
 
-return RagdollClient
+return Binder.new("Ragdoll", RagdollClient)

package/src/Client/Classes/RagdollHumanoidOnDeathClient.lua

@@ -8,20 +8,20 @@
 local require = require(script.Parent.loader).load(script)
 
 local RunService = game:GetService("RunService")
-
 local Players = game:GetService("Players")
 local Workspace = game:GetService("Workspace")
 
 local BaseObject = require("BaseObject")
-local RagdollBindersClient = require("RagdollBindersClient")
+local Binder = require("Binder")
 local CharacterUtils = require("CharacterUtils")
+local RagdollClient = require("RagdollClient")
 
 local RagdollHumanoidOnDeathClient = setmetatable({}, BaseObject)
 RagdollHumanoidOnDeathClient.ClassName = "RagdollHumanoidOnDeathClient"
 RagdollHumanoidOnDeathClient.__index = RagdollHumanoidOnDeathClient
 
 --[=[
-	Constructs a new RagdollHumanoidOnDeathClient. Should be done via [Binder]. See [RagdollBindersClient].
+	Constructs a new RagdollHumanoidOnDeathClient. This module exports a [Binder].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return RagdollHumanoidOnDeathClient
@@ -29,7 +29,8 @@ RagdollHumanoidOnDeathClient.__index = RagdollHumanoidOnDeathClient
 function RagdollHumanoidOnDeathClient.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollHumanoidOnDeathClient)
 
-	self._ragdollBinder = serviceBag:GetService(RagdollBindersClient).Ragdoll
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._ragdollBinder = self._serviceBag:GetService(RagdollClient)
 
 	if self._obj:GetState() == Enum.HumanoidStateType.Dead then
 		self:_handleDeath()
@@ -95,4 +96,4 @@ function RagdollHumanoidOnDeathClient.disableParticleEmittersAndFadeOutYielding(
 	end
 end
 
-return RagdollHumanoidOnDeathClient
+return Binder.new("RagdollHumanoidOnDeath", RagdollHumanoidOnDeathClient)

package/src/Client/Classes/RagdollHumanoidOnFallClient.lua

@@ -11,8 +11,9 @@ local Players = game:GetService("Players")
 
 local BaseObject = require("BaseObject")
 local BindableRagdollHumanoidOnFall = require("BindableRagdollHumanoidOnFall")
+local Binder = require("Binder")
 local CharacterUtils = require("CharacterUtils")
-local RagdollBindersClient = require("RagdollBindersClient")
+local RagdollClient = require("RagdollClient")
 local RagdollHumanoidOnFallConstants = require("RagdollHumanoidOnFallConstants")
 
 local RagdollHumanoidOnFallClient = setmetatable({}, BaseObject)
@@ -22,7 +23,7 @@ RagdollHumanoidOnFallClient.__index = RagdollHumanoidOnFallClient
 require("PromiseRemoteEventMixin"):Add(RagdollHumanoidOnFallClient, RagdollHumanoidOnFallConstants.REMOTE_EVENT_NAME)
 
 --[=[
-	Constructs a new RagdollHumanoidOnFallClient. Should be done via [Binder]. See [RagdollBindersClient].
+	Constructs a new RagdollHumanoidOnFallClient. This module exports a [Binder].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return RagdollHumanoidOnFallClient
@@ -30,7 +31,8 @@ require("PromiseRemoteEventMixin"):Add(RagdollHumanoidOnFallClient, RagdollHuman
 function RagdollHumanoidOnFallClient.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollHumanoidOnFallClient)
 
-	self._ragdollBinder = serviceBag:GetService(RagdollBindersClient).Ragdoll
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._ragdollBinder = self._serviceBag:GetService(RagdollClient)
 
 	local player = CharacterUtils.getPlayerFromCharacter(self._obj)
 	if player == Players.LocalPlayer then
@@ -54,4 +56,4 @@ function RagdollHumanoidOnFallClient:_update()
 	end
 end
 
-return RagdollHumanoidOnFallClient
+return Binder.new("RagdollHumanoidOnFall", RagdollHumanoidOnFallClient)

package/src/Client/Classes/RagdollableClient.lua

@@ -1,5 +1,5 @@
 --[=[
-	Should be bound via [RagdollBindersClient].
+	Initialize via [RagdollServiceClient].
 
 	@client
 	@class RagdollableClient
@@ -8,8 +8,9 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local RagdollBindersClient = require("RagdollBindersClient")
+local RagdollClient = require("RagdollClient")
 local RxRagdollUtils = require("RxRagdollUtils")
+local Binder = require("Binder")
 
 local RagdollableClient = setmetatable({}, BaseObject)
 RagdollableClient.ClassName = "RagdollableClient"
@@ -25,22 +26,21 @@ function RagdollableClient.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollableClient)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._ragdollBindersClient = self._serviceBag:GetService(RagdollBindersClient)
+	self._ragdollBinder = self._serviceBag:GetService(RagdollClient)
 
-	self._maid:GiveTask(self._ragdollBindersClient.Ragdoll:ObserveInstance(self._obj, function()
-		self:_onRagdollChanged()
+	self._maid:GiveTask(self._ragdollBinder:Observe(self._obj):Subscribe(function(ragdoll)
+		self:_onRagdollChanged(ragdoll)
 	end))
-	self:_onRagdollChanged()
 
 	return self
 end
 
-function RagdollableClient:_onRagdollChanged()
-	if self._ragdollBindersClient.Ragdoll:Get(self._obj) then
+function RagdollableClient:_onRagdollChanged(ragdoll)
+	if ragdoll then
 		self._maid._ragdoll = RxRagdollUtils.runLocal(self._obj)
 	else
 		self._maid._ragdoll = nil
 	end
 end
 
-return RagdollableClient
+return Binder.new("Ragdollable", RagdollableClient)

package/src/Client/RagdollBindersClient.lua

@@ -2,15 +2,9 @@
 	Holds binders for Ragdolls on the client. Be sure to initialize on the server. See [RagdollBindersClient] for details.
 	Be sure to use a [ServiceBag] to initialize this service.
 
-	```lua
-	-- Client.lua
-
-	local serviceBag = require("ServiceBag")
-	serviceBag:GetService(require("RagdollBindersClient"))
-
-	serviceBag:Init()
-	serviceBag:Start()
-	```
+	:::tip
+	Binders can be retrieved directly through a [ServiceBag] now.
+	:::
 
 	@client
 	@class RagdollBindersClient
@@ -19,7 +13,6 @@
 local require = require(script.Parent.loader).load(script)
 
 local BinderProvider = require("BinderProvider")
-local Binder = require("Binder")
 
 return BinderProvider.new(script.Name, function(self, serviceBag)
 --[=[
@@ -36,26 +29,26 @@ return BinderProvider.new(script.Name, function(self, serviceBag)
 	@prop Ragdoll Binder<RagdollClient>
 	@within RagdollBindersClient
 ]=]
-	self:Add(Binder.new("Ragdoll", require("RagdollClient"), serviceBag))
+	self:Add(serviceBag:GetService(require("RagdollClient")))
 
 --[=[
 	Enables ragdolling on a humanoid.
 	@prop Ragdollable Binder<RagdollableClient>
 	@within RagdollBindersClient
 ]=]
-	self:Add(Binder.new("Ragdollable", require("RagdollableClient"), serviceBag))
+	self:Add(serviceBag:GetService(require("RagdollableClient")))
 
 --[=[
 	Automatically applies ragdoll upon humanoid death.
 	@prop RagdollaRagdollHumanoidOnDeathble Binder<RagdollHumanoidOnDeathClient>
 	@within RagdollBindersClient
 ]=]
-	self:Add(Binder.new("RagdollHumanoidOnDeath", require("RagdollHumanoidOnDeathClient"), serviceBag))
+	self:Add(serviceBag:GetService(require("RagdollHumanoidOnDeathClient")))
 
 --[=[
 	Automatically applies ragdoll upon humanoid fall.
 	@prop RagdollHumanoidOnFall Binder<RagdollHumanoidOnFallClient>
 	@within RagdollBindersClient
 ]=]
-	self:Add(Binder.new("RagdollHumanoidOnFall", require("RagdollHumanoidOnFallClient"), serviceBag))
+	self:Add(serviceBag:GetService(require("RagdollHumanoidOnFallClient")))
 end)

package/src/Client/RagdollServiceClient.lua

@@ -1,4 +1,6 @@
 --[=[
+	Initializes the RagdollService on the client.
+
 	@client
 	@class RagdollServiceClient
 ]=]
@@ -26,6 +28,10 @@ function RagdollServiceClient:Init(serviceBag)
 	self._serviceBag:GetService(require("CameraStackService"))
 
 	-- Internal
+	self._serviceBag:GetService(require("RagdollClient"))
+	self._serviceBag:GetService(require("RagdollableClient"))
+	self._serviceBag:GetService(require("RagdollHumanoidOnDeathClient"))
+	self._serviceBag:GetService(require("RagdollHumanoidOnFallClient"))
 	self._serviceBag:GetService(require("RagdollBindersClient"))
 
 	self._screenShakeEnabled = true

package/src/Server/Classes/Ragdoll.lua

@@ -1,20 +1,27 @@
 --[=[
-	Base class for ragdolls, meant to be used with binders. See [RagdollBindersServer].
+	Base class for ragdolls, meant to be used with binders. This class exports a [Binder].
 	While a humanoid is bound with this class, it is ragdolled.
 
+	:::tip
+	Initialize this whole system through [RagdollService].
+	:::
+
 	```lua
 	-- Be sure to do the service init on the client too
-	local serviceBag = require("ServiceBag")
-	local ragdollBindersServer = serviceBag:GetService(require("RagdollBindersServer"))
+	local ServiceBag = require("ServiceBag")
+	local Ragdoll = require("Ragdoll")
+
+	local serviceBag = ServiceBag.new()
+	serviceBag:GetService(require("RagdollService"))
 
 	serviceBag:Init()
 	serviceBag:Start()
 
 	-- Enable ragdoll
-	ragdollBindersServer.Ragdoll:Bind(humanoid)
+	Ragdoll:Tag(humanoid)
 
 	-- Disable ragdoll
-	ragdollBindersServer.Ragdoll:Unbind(humanoid)
+	Ragdoll:Untag(humanoid)
 	```
 
 	@class Ragdoll
@@ -23,6 +30,7 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
+local Binder = require("Binder")
 
 local Ragdoll = setmetatable({}, BaseObject)
 Ragdoll.ClassName = "Ragdoll"
@@ -40,4 +48,4 @@ function Ragdoll.new(humanoid, _serviceBag)
 	return self
 end
 
-return Ragdoll
+return Binder.new("Ragdoll", Ragdoll)

package/src/Server/Classes/RagdollHumanoidOnDeath.lua

@@ -1,5 +1,5 @@
 --[=[
-	Ragdolls the humanoid on death.
+	Ragdolls the humanoid on death. This class exports a [Binder].
 	@server
 	@class RagdollHumanoidOnDeath
 ]=]
@@ -7,14 +7,15 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local RagdollBindersServer = require("RagdollBindersServer")
+local Ragdoll = require("Ragdoll")
+local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
 
 local RagdollHumanoidOnDeath = setmetatable({}, BaseObject)
 RagdollHumanoidOnDeath.ClassName = "RagdollHumanoidOnDeath"
 RagdollHumanoidOnDeath.__index = RagdollHumanoidOnDeath
 
 --[=[
-	Constructs a new RagdollHumanoidOnDeath. Should be done via [Binder]. See [RagdollBindersServer].
+	Constructs a new RagdollHumanoidOnDeath. This class exports a [Binder].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return RagdollHumanoidOnDeath
@@ -22,7 +23,8 @@ RagdollHumanoidOnDeath.__index = RagdollHumanoidOnDeath
 function RagdollHumanoidOnDeath.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollHumanoidOnDeath)
 
-	self._ragdollBinder = serviceBag:GetService(RagdollBindersServer).Ragdoll
+	self._serviceBag = assert(serviceBag, "Bad serviceBag")
+	self._ragdollBinder = self._serviceBag:GetService(Ragdoll)
 
 	self._obj.BreakJointsOnDeath = false
 	self._maid:GiveTask(function()
@@ -38,4 +40,4 @@ function RagdollHumanoidOnDeath.new(humanoid, serviceBag)
 	return self
 end
 
-return RagdollHumanoidOnDeath
+return PlayerHumanoidBinder.new("RagdollHumanoidOnDeath", RagdollHumanoidOnDeath)

package/src/Server/Classes/RagdollHumanoidOnFall.lua

@@ -11,7 +11,8 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local BindableRagdollHumanoidOnFall = require("BindableRagdollHumanoidOnFall")
 local CharacterUtils = require("CharacterUtils")
-local RagdollBindersServer = require("RagdollBindersServer")
+local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
+local Ragdoll = require("Ragdoll")
 local RagdollHumanoidOnFallConstants = require("RagdollHumanoidOnFallConstants")
 
 local RagdollHumanoidOnFall = setmetatable({}, BaseObject)
@@ -19,7 +20,7 @@ RagdollHumanoidOnFall.ClassName = "RagdollHumanoidOnFall"
 RagdollHumanoidOnFall.__index = RagdollHumanoidOnFall
 
 --[=[
-	Constructs a new RagdollHumanoidOnFall. Should be done via [Binder]. See [RagdollBindersServer].
+	Constructs a new RagdollHumanoidOnFall. Should be done via [Binder]. See [Ragdoll].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return RagdollHumanoidOnFall
@@ -27,7 +28,8 @@ RagdollHumanoidOnFall.__index = RagdollHumanoidOnFall
 function RagdollHumanoidOnFall.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), RagdollHumanoidOnFall)
 
-	self._ragdollBinder = serviceBag:GetService(RagdollBindersServer).Ragdoll
+	self._serviceBag = assert(serviceBag, "Bad serviceBag")
+	self._ragdollBinder = self._serviceBag:GetService(Ragdoll)
 
 	local player = CharacterUtils.getPlayerFromCharacter(self._obj)
 	if player then
@@ -89,4 +91,4 @@ function RagdollHumanoidOnFall:_update()
 	end
 end
 
-return RagdollHumanoidOnFall
+return PlayerHumanoidBinder.new("RagdollHumanoidOnFall", RagdollHumanoidOnFall)

package/src/Server/Classes/Ragdollable.lua

@@ -1,28 +1,29 @@
 --[=[
-	Should be bound to any humanoid that is ragdollable. See [RagdollBindersServer].
+	Should be bound to any humanoid that is ragdollable. This class exports a [Binder].
 	@server
 	@class Ragdollable
 ]=]
 
 local require = require(script.Parent.loader).load(script)
 
-local RxBrioUtils = require("RxBrioUtils")
 local BaseObject = require("BaseObject")
-local RagdollBindersServer = require("RagdollBindersServer")
-local RxRagdollUtils = require("RxRagdollUtils")
 local Maid = require("Maid")
+local Motor6DBindersServer = require("Motor6DBindersServer")
+local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
+local Ragdoll = require("Ragdoll")
 local RagdollAdditionalAttachmentUtils = require("RagdollAdditionalAttachmentUtils")
-local RagdollCollisionUtils = require("RagdollCollisionUtils")
 local RagdollBallSocketUtils = require("RagdollBallSocketUtils")
-local Motor6DBindersServer = require("Motor6DBindersServer")
+local RagdollCollisionUtils = require("RagdollCollisionUtils")
 local RagdollMotorUtils = require("RagdollMotorUtils")
+local RxBrioUtils = require("RxBrioUtils")
+local RxRagdollUtils = require("RxRagdollUtils")
 
 local Ragdollable = setmetatable({}, BaseObject)
 Ragdollable.ClassName = "Ragdollable"
 Ragdollable.__index = Ragdollable
 
 --[=[
-	Constructs a new Ragdollable. Should be done via [Binder]. See [RagdollBindersServer].
+	Constructs a new Ragdollable. This class exports a [Binder].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return Ragdollable
@@ -31,7 +32,7 @@ function Ragdollable.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), Ragdollable)
 
 	self._serviceBag = assert(serviceBag, "No serviceBag")
-	self._ragdollBindersServer = self._serviceBag:GetService(RagdollBindersServer)
+	self._ragdollBinder = self._serviceBag:GetService(Ragdoll)
 	self._motor6DBindersServer = self._serviceBag:GetService(Motor6DBindersServer)
 
 	self._motor6DBindersServer.Motor6DStackHumanoid:Bind(self._obj)
@@ -58,7 +59,7 @@ function Ragdollable.new(humanoid, serviceBag)
 		end
 	end))
 
-	self._maid:GiveTask(self._ragdollBindersServer.Ragdoll:ObserveInstance(self._obj, function()
+	self._maid:GiveTask(self._ragdollBinder:ObserveInstance(self._obj, function()
 		self:_onRagdollChanged()
 	end))
 	self:_onRagdollChanged()
@@ -67,7 +68,7 @@ function Ragdollable.new(humanoid, serviceBag)
 end
 
 function Ragdollable:_onRagdollChanged()
-	if self._ragdollBindersServer.Ragdoll:Get(self._obj) then
+	if self._ragdollBinder:Get(self._obj) then
 		self:_setRagdollEnabled(true)
 	else
 		self:_setRagdollEnabled(false)
@@ -86,4 +87,4 @@ function Ragdollable:_setRagdollEnabled(isEnabled)
 	end
 end
 
-return Ragdollable
+return PlayerHumanoidBinder.new("Ragdollable", Ragdollable)

package/src/Server/Classes/UnragdollAutomatically.lua

@@ -1,30 +1,32 @@
 --[=[
-	When a humanoid is tagged with this, it will unragdoll automatically.
+	When a humanoid is tagged with this, it will unragdoll automatically. This class exports a [Binder].
 	@server
 	@class UnragdollAutomatically
 ]=]
 
 local require = require(script.Parent.loader).load(script)
 
+local AttributeValue = require("AttributeValue")
 local BaseObject = require("BaseObject")
-local RagdollBindersServer = require("RagdollBindersServer")
+local cancellableDelay = require("cancellableDelay")
 local CharacterUtils = require("CharacterUtils")
-local AttributeValue = require("AttributeValue")
 local Maid = require("Maid")
-local UnragdollAutomaticallyConstants = require("UnragdollAutomaticallyConstants")
-local cancellableDelay = require("cancellableDelay")
 local Observable = require("Observable")
+local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
+local Ragdoll = require("Ragdoll")
+local RagdollHumanoidOnFall = require("RagdollHumanoidOnFall")
 local Rx = require("Rx")
-local RxInstanceUtils = require("RxInstanceUtils")
-local RxBrioUtils = require("RxBrioUtils")
 local RxBinderUtils = require("RxBinderUtils")
+local RxBrioUtils = require("RxBrioUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
+local UnragdollAutomaticallyConstants = require("UnragdollAutomaticallyConstants")
 
 local UnragdollAutomatically = setmetatable({}, BaseObject)
 UnragdollAutomatically.ClassName = "UnragdollAutomatically"
 UnragdollAutomatically.__index = UnragdollAutomatically
 
 --[=[
-	Constructs a new UnragdollAutomatically. Should be done via [Binder]. See [RagdollBindersServer].
+	Constructs a new UnragdollAutomatically. This class exports a [Binder].
 	@param humanoid Humanoid
 	@param serviceBag ServiceBag
 	@return UnragdollAutomatically
@@ -32,13 +34,15 @@ UnragdollAutomatically.__index = UnragdollAutomatically
 function UnragdollAutomatically.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), UnragdollAutomatically)
 
-	self._ragdollBindersServer = serviceBag:GetService(RagdollBindersServer)
+	self._serviceBag = assert(serviceBag, "Bad serviceBag")
+	self._ragdollBinder = self._serviceBag:GetService(Ragdoll)
+	self._ragdollHumanoidOnFallBinder = self._serviceBag:GetService(RagdollHumanoidOnFall)
 	self._player = CharacterUtils.getPlayerFromCharacter(self._obj)
 
 	self._unragdollAutomatically = AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE, true)
 	self._unragdollAutomaticTime = AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE, 5)
 
-	self._maid:GiveTask(self._ragdollBindersServer.Ragdoll:ObserveInstance(self._obj, function()
+	self._maid:GiveTask(self._ragdollBinder:ObserveInstance(self._obj, function()
 		self:_handleRagdollChanged(self._maid)
 	end))
 	self:_handleRagdollChanged(self._maid)
@@ -47,7 +51,7 @@ function UnragdollAutomatically.new(humanoid, serviceBag)
 end
 
 function UnragdollAutomatically:_handleRagdollChanged(maid)
-	if self._ragdollBindersServer.Ragdoll:Get(self._obj) then
+	if self._ragdollBinder:Get(self._obj) then
 		maid._unragdoll = self:_observeCanUnragdollTimer():Pipe({
 			Rx.switchMap(function(state)
 				if state then
@@ -59,7 +63,7 @@ function UnragdollAutomatically:_handleRagdollChanged(maid)
 			Rx.distinct();
 		}):Subscribe(function(canUnragdoll)
 			if canUnragdoll then
-				self._ragdollBindersServer.Ragdoll:Unbind(self._obj)
+				self._ragdollBinder:Unbind(self._obj)
 			end
 		end)
 	else
@@ -133,7 +137,7 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 end
 
 function UnragdollAutomatically:_observeIsFallingRagdoll()
-	return RxBinderUtils.observeBoundClassBrio(self._ragdollBindersServer.RagdollHumanoidOnFall, self._obj)
+	return RxBinderUtils.observeBoundClassBrio(self._ragdollHumanoidOnFallBinder, self._obj)
 		:Pipe({
 			RxBrioUtils.switchMapBrio(function(ragdollHumanoidOnFall)
 				return ragdollHumanoidOnFall:ObserveIsFalling()
@@ -143,4 +147,4 @@ function UnragdollAutomatically:_observeIsFallingRagdoll()
 		})
 end
 
-return UnragdollAutomatically
+return PlayerHumanoidBinder.new("UnragdollAutomatically", UnragdollAutomatically)

package/src/Server/RagdollBindersServer.lua

@@ -2,17 +2,9 @@
 	Holds binders for Ragdoll system. Be sure to initialize on the client too. See [RagdollBindersClient].
 	Be sure to use a [ServiceBag] to initialize this service.
 
-	```lua
-	-- Server.lua
-
-	local serviceBag = require("ServiceBag")
-	local ragdollBindersServer = serviceBag:GetService(require("RagdollBindersServer"))
-	serviceBag:Init()
-
-	ragdollBindersServer.RagdollHumanoidOnDeath:SetAutomaticTagging(false)
-
-	serviceBag:Start()
-	```
+	:::tip
+	Binders can be retrieved directly through a [ServiceBag] now.
+	:::
 
 	@server
 	@class RagdollBindersServer
@@ -21,15 +13,13 @@
 local require = require(script.Parent.loader).load(script)
 
 local BinderProvider = require("BinderProvider")
-local Binder = require("Binder")
-local PlayerHumanoidBinder = require("PlayerHumanoidBinder")
 
 return BinderProvider.new(script.Name, function(self, serviceBag)
 --[=[
 	Apply this [Binder] to a humanoid to ragdoll it. Humanoid must already have [Ragdollable] defined.
 
 	```lua
-	local ragdollBinder = serviceBag:GetService(RagdollBindersClient).Ragdoll
+	local ragdollBinder = serviceBag:GetService(RagdollBindersServer).Ragdoll
 
 	local ragdoll = ragdollBinder:Get(humanoid)
 	if ragdoll then
@@ -51,7 +41,7 @@ return BinderProvider.new(script.Name, function(self, serviceBag)
 	```lua
 	local maid = Maid.new()
 
-	local ragdollBinder = serviceBag:GetService(RagdollBindersClient).Ragdoll
+	local ragdollBinder = serviceBag:GetService(RagdollBindersServer).Ragdoll
 	maid:GiveTask(RxBinderUtils.observeBoundClass(ragdollBinder, humanoid):Subscribe(function(ragdoll)
 		if ragdoll then
 			print("Ragdolled!")
@@ -64,33 +54,33 @@ return BinderProvider.new(script.Name, function(self, serviceBag)
 	@prop Ragdoll Binder<Ragdoll>
 	@within RagdollBindersServer
 ]=]
-	self:Add(Binder.new("Ragdoll", require("Ragdoll"), serviceBag))
+	self:Add(serviceBag:GetService(require("Ragdoll")))
 
 --[=[
 	Enables ragdolling on a humanoid.
 	@prop Ragdollable PlayerHumanoidBinder<Ragdollable>
 	@within RagdollBindersServer
 ]=]
-	self:Add(PlayerHumanoidBinder.new("Ragdollable", require("Ragdollable"), serviceBag))
+	self:Add(serviceBag:GetService(require("Ragdollable")))
 
 --[=[
 	Automatically applies ragdoll upon humanoid death.
 	@prop RagdollHumanoidOnDeath PlayerHumanoidBinder<RagdollHumanoidOnDeath>
 	@within RagdollBindersServer
 ]=]
-	self:Add(PlayerHumanoidBinder.new("RagdollHumanoidOnDeath", require("RagdollHumanoidOnDeath"), serviceBag))
+	self:Add(serviceBag:GetService(require("RagdollHumanoidOnDeath")))
 
 --[=[
 	Automatically applies ragdoll upon humanoid fall.
 	@prop RagdollHumanoidOnFall PlayerHumanoidBinder<RagdollHumanoidOnFall>
 	@within RagdollBindersServer
 ]=]
-	self:Add(PlayerHumanoidBinder.new("RagdollHumanoidOnFall", require("RagdollHumanoidOnFall"), serviceBag))
+	self:Add(serviceBag:GetService(require("RagdollHumanoidOnFall")))
 
 --[=[
 	Automatically unragdolls the humanoid.
 	@prop UnragdollAutomatically PlayerHumanoidBinder<UnragdollAutomatically>
 	@within RagdollBindersServer
 ]=]
-	self:Add(PlayerHumanoidBinder.new("UnragdollAutomatically", require("UnragdollAutomatically"), serviceBag))
+	self:Add(serviceBag:GetService(require("UnragdollAutomatically")))
 end)

package/src/Server/RagdollService.lua

@@ -20,11 +20,19 @@ function RagdollService:Init(serviceBag)
 	self._serviceBag:GetService(require("Motor6DService"))
 
 	-- Internal
-	self._binders = self._serviceBag:GetService(require("RagdollBindersServer"))
+	self._serviceBag:GetService(require("RagdollBindersServer"))
 
-	self._binders.RagdollHumanoidOnFall:SetAutomaticTagging(false)
-	self._binders.RagdollHumanoidOnDeath:SetAutomaticTagging(false)
-	self._binders.UnragdollAutomatically:SetAutomaticTagging(false)
+	-- Binders
+	self._serviceBag:GetService(require("Ragdoll"))
+	self._serviceBag:GetService(require("Ragdollable"))
+	self._serviceBag:GetService(require("RagdollHumanoidOnDeath"))
+	self._serviceBag:GetService(require("RagdollHumanoidOnFall"))
+	self._serviceBag:GetService(require("UnragdollAutomatically"))
+
+	-- Configure
+	self._serviceBag:GetService(require("RagdollHumanoidOnDeath")):SetAutomaticTagging(false)
+	self._serviceBag:GetService(require("RagdollHumanoidOnFall")):SetAutomaticTagging(false)
+	self._serviceBag:GetService(require("UnragdollAutomatically")):SetAutomaticTagging(false)
 end
 
 --[=[
@@ -35,7 +43,7 @@ function RagdollService:SetRagdollOnFall(ragdollOnFall)
 	assert(self._serviceBag, "Not initialized")
 	assert(type(ragdollOnFall) == "boolean", "Bad ragdollOnFall")
 
-	self._binders.RagdollHumanoidOnFall:SetAutomaticTagging(ragdollOnFall)
+	self._serviceBag:GetService(require("RagdollHumanoidOnFall")):SetAutomaticTagging(ragdollOnFall)
 end
 
 --[=[
@@ -46,7 +54,7 @@ function RagdollService:SetRagdollOnDeath(ragdollOnDeath)
 	assert(self._serviceBag, "Not initialized")
 	assert(type(ragdollOnDeath) == "boolean", "Bad ragdollOnDeath")
 
-	self._binders.RagdollHumanoidOnDeath:SetAutomaticTagging(ragdollOnDeath)
+	self._serviceBag:GetService(require("RagdollHumanoidOnDeath")):SetAutomaticTagging(ragdollOnDeath)
 end
 
 --[=[
@@ -57,7 +65,7 @@ function RagdollService:SetUnragdollAutomatically(unragdollAutomatically)
 	assert(self._serviceBag, "Not initialized")
 	assert(type(unragdollAutomatically) == "boolean", "Bad unragdollAutomatically")
 
-	self._binders.UnragdollAutomatically:SetAutomaticTagging(unragdollAutomatically)
+	self._serviceBag:GetService(require("UnragdollAutomatically")):SetAutomaticTagging(unragdollAutomatically)
 end
 
 return RagdollService