hotbar: wrap

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "ThirdParty/Character-Realism"]
-	path = ThirdParty/Character-Realism
-	url = https://github.com/MaximumADHD/Character-Realism

ReplicatedStorage/Shared/ChunkManager/init.lua

@@ -13,6 +13,7 @@ local Globals = require(script.Parent:WaitForChild("Globals"))
 
 local remote = game:GetService("ReplicatedStorage"):WaitForChild("RecieveChunkPacket")
 local tickremote = game:GetService("ReplicatedStorage"):WaitForChild("Tick")
+local Players = game:GetService("Players")
 
 local ChunkFolder = Instance.new("Folder")
 ChunkFolder.Name = "$blockscraft_client"
@@ -23,7 +24,7 @@ local CHUNK_RADIUS = Globals.RenderDistance or 5
 local LOAD_BATCH = Globals.LoadBatch or 8
 local RESYNC_INTERVAL = Globals.ResyncInterval or 5
 local RESYNC_RADIUS = Globals.ResyncRadius or 2
-local DEBUG_RESYNC = true
+local DEBUG_RESYNC = false
 local FORCELOAD_CHUNKS = {
 	{0, 1, 0}
 }
@@ -35,7 +36,11 @@ local lastChunkKey: string? = nil
 local lastHeavyTick = 0
 local HEAVY_TICK_INTERVAL = 1.5
 local lastUnloadSweep = 0
-local UNLOAD_SWEEP_INTERVAL = 1.5
+local UNLOAD_SWEEP_INTERVAL = 3 -- slower sweep cadence
+local MAX_LOADED_CHUNKS = 0
+local SPAWN_CHUNK_KEY: string? = nil
+local playerFrozen = false
+local storedMovementState = nil
 
 local function worldToChunkCoord(v: number): number
 	return math.floor((v + 16) / 32)
@@ -53,6 +58,11 @@ do
 	table.sort(CHUNK_OFFSETS, function(a, b)
 		return a[4] < b[4]
 	end)
+	MAX_LOADED_CHUNKS = math.max(1, math.floor(#CHUNK_OFFSETS * 2)) -- tighter cap than full render cube
+	if FORCELOAD_CHUNKS[1] then
+		local forced = FORCELOAD_CHUNKS[1]
+		SPAWN_CHUNK_KEY = `{forced[1]},{forced[2]},{forced[3]}`
+	end
 end
 
 function ChunkManager:UnloadAllNow()
@@ -77,6 +87,126 @@ local function Swait(l)
 	end
 end
 
+local function setCharacterFrozen(shouldFreeze: boolean)
+	local player = Players.LocalPlayer
+	if not player then
+		return
+	end
+	local character = player.Character
+	if not character then
+		return
+	end
+	local humanoid = character:FindFirstChildOfClass("Humanoid")
+	local root = character:FindFirstChild("HumanoidRootPart")
+	if not humanoid or not root then
+		return
+	end
+	if shouldFreeze == playerFrozen then
+		return
+	end
+	if shouldFreeze then
+		if not storedMovementState then
+			storedMovementState = {
+				walkSpeed = humanoid.WalkSpeed,
+				autoRotate = humanoid.AutoRotate,
+			}
+			if humanoid.UseJumpPower then
+				storedMovementState.jumpPower = humanoid.JumpPower
+			else
+				storedMovementState.jumpHeight = humanoid.JumpHeight
+			end
+		end
+		humanoid.AutoRotate = false
+		humanoid.WalkSpeed = 0
+		if humanoid.UseJumpPower then
+			humanoid.JumpPower = 0
+		else
+			humanoid.JumpHeight = 0
+		end
+		root.Anchored = true
+	else
+		root.Anchored = false
+		if storedMovementState then
+			humanoid.AutoRotate = storedMovementState.autoRotate
+			humanoid.WalkSpeed = storedMovementState.walkSpeed
+			if humanoid.UseJumpPower and storedMovementState.jumpPower then
+				humanoid.JumpPower = storedMovementState.jumpPower
+			elseif storedMovementState.jumpHeight then
+				humanoid.JumpHeight = storedMovementState.jumpHeight
+			end
+		end
+		storedMovementState = nil
+	end
+	playerFrozen = shouldFreeze
+end
+
+local function getLocalPlayerChunkPos()
+	local player = Players.LocalPlayer
+	if not player then
+		return nil
+	end
+	local character = player.Character
+	if not character then
+		return nil
+	end
+	local root = character:FindFirstChild("HumanoidRootPart")
+	if not root then
+		return nil
+	end
+	local pos = root.Position
+	return {
+		x = worldToChunkCoord(pos.X),
+		y = worldToChunkCoord(pos.Y),
+		z = worldToChunkCoord(pos.Z)
+	}
+end
+
+local function isWithinRenderDistance(chunkPos: Vector3, centerChunkPos): boolean
+	if not centerChunkPos then
+		return false
+	end
+	return math.abs(chunkPos.X - centerChunkPos.x) <= CHUNK_RADIUS
+		and math.abs(chunkPos.Y - centerChunkPos.y) <= CHUNK_RADIUS
+		and math.abs(chunkPos.Z - centerChunkPos.z) <= CHUNK_RADIUS
+end
+
+local function shouldSkipUnload(key: string): boolean
+	return SPAWN_CHUNK_KEY ~= nil and key == SPAWN_CHUNK_KEY
+end
+
+local function scheduleChunkUnload(key: string, chunk)
+	if not chunk or unloadingChunks[key] then
+		return
+	end
+	unloadingChunks[key] = true
+	task.defer(function()
+		chunk:Unload()
+		chunk:Destroy()
+		Chunk.AllChunks[key] = nil
+		unloadingChunks[key] = nil
+	end)
+end
+
+local function evictOutOfRangeChunks(centerChunkPos)
+	if not centerChunkPos then
+		return
+	end
+	local loadedCount = 0
+	for key, loadedChunk in pairs(Chunk.AllChunks) do
+		if loadedChunk.loaded and not shouldSkipUnload(key) then
+			local inRange = isWithinRenderDistance(loadedChunk.pos, centerChunkPos)
+			if inRange then
+				loadedCount += 1
+				if loadedCount > MAX_LOADED_CHUNKS then
+					scheduleChunkUnload(key, loadedChunk)
+				end
+			else
+				scheduleChunkUnload(key, loadedChunk)
+			end
+		end
+	end
+end
+
 function ChunkManager:GetChunk(x, y, z)
 	local key = `{x},{y},{z}`
 	if Chunk.AllChunks[key] then
@@ -112,7 +242,10 @@ local function ensureNeighboringChunksLoaded(x, y, z)
 
 	for _, offset in ipairs(offsets) do
 		local nx, ny, nz = x + offset[1], y + offset[2], z + offset[3]
-		ChunkManager:GetChunk(nx, ny, nz):Tick()
+		local neighbor = ChunkManager:GetChunk(nx, ny, nz)
+		if neighbor then
+			neighbor:Tick()
+		end
 	end
 end
 
@@ -136,6 +269,7 @@ function ChunkManager:LoadChunk(x, y, z)
 		chunk.instance = instance
 		chunk.loaded = true
 		unloadingChunks[key] = nil
+		evictOutOfRangeChunks(getLocalPlayerChunkPos())
 	end)
 end
 
@@ -251,7 +385,7 @@ end
 
 function ChunkManager:Tick()
 	ChunkManager:ForceTick()
-	local player = game:GetService("Players").LocalPlayer
+	local player = Players.LocalPlayer
 	if not player.Character then
 		return
 	end
@@ -263,6 +397,7 @@ function ChunkManager:Tick()
 		z = worldToChunkCoord(pos.Z)
 	}
 	local ck = `{chunkPos.x},{chunkPos.y},{chunkPos.z}`
+	local currentChunk = Chunk.AllChunks[ck]
 	local now = tick()
 	local shouldHeavyTick = (ck ~= lastChunkKey) or (now - lastHeavyTick >= HEAVY_TICK_INTERVAL)
 	lastChunkKey = ck
@@ -270,12 +405,15 @@ function ChunkManager:Tick()
 		lastHeavyTick = now
 	end
 
+	setCharacterFrozen(not (currentChunk and currentChunk.loaded))
+
 	if shouldHeavyTick then
 		task.defer(function()
 			local processed = 0
 			for _, offset in ipairs(CHUNK_OFFSETS) do
 				local cx, cy, cz = chunkPos.x + offset[1], chunkPos.y + offset[2], chunkPos.z + offset[3]
 				local chunk = ChunkManager:GetChunk(cx, cy, cz)
+				if chunk then
 					chunk.inhabitedTime = now
 					if not chunk.loaded then
 						ChunkManager:LoadChunk(cx, cy, cz)
@@ -285,11 +423,11 @@ function ChunkManager:Tick()
 						end
 					end
 				end
+			end
 		end)
 	else
-		local current = Chunk.AllChunks[ck]
+		if currentChunk then
-		if current then
+			currentChunk.inhabitedTime = now
-			current.inhabitedTime = now
 		end
 	end
 	
@@ -318,14 +456,8 @@ function ChunkManager:Tick()
 	if now - lastUnloadSweep >= UNLOAD_SWEEP_INTERVAL then
 		lastUnloadSweep = now
 		for key, loadedChunk in pairs(Chunk.AllChunks) do
-			if now - loadedChunk.inhabitedTime > 15 and not unloadingChunks[key] then
+			if now - loadedChunk.inhabitedTime > 30 and not unloadingChunks[key] and not shouldSkipUnload(key) then -- keep chunks around longer before unloading
-				unloadingChunks[key] = true
+				scheduleChunkUnload(key, loadedChunk)
-				task.defer(function()
-					loadedChunk:Unload()
-					loadedChunk:Destroy()
-					Chunk.AllChunks[key] = nil
-					unloadingChunks[key] = nil
-				end)
 			end
 		end
 	end

ReplicatedStorage/Shared/ClientState.lua

@@ -117,10 +117,12 @@ function ClientState:SetSelectedSlot(slot: number)
 		return
 	end
 	local hotbar = replicaForPlayer.Data.hotbar
-	if not hotbar or not hotbar[slot] then
+	if not hotbar then
 		return
 	end
+	if slot and slot >= 1 and slot <= HOTBAR_SIZE then
 		replicaForPlayer:FireServer("SelectHotbarSlot", slot)
+	end
 end
 
 ClientState.Changed = changed.Event

ReplicatedStorage/Shared/PlacementManager.lua

@@ -6,7 +6,7 @@ local PlacementManager = {}
 local ChunkManager = require("./ChunkManager")
 local Util = require("./Util")
 
-local DEBUG_PLACEMENT = true
+local DEBUG_PLACEMENT = false
 local function debugPlacementLog(...: any)
 	if DEBUG_PLACEMENT then
 		Util.StudioLog(...)
@@ -265,13 +265,15 @@ local function ensureChunkFolder(): Instance?
 end
 
 -- Gets the block and normalid of the block (and surface) the player is looking at
-function PlacementManager:Raycast()
+function PlacementManager:Raycast(skipSelection: boolean?)
 	if not Mouse then
 		Mouse = game:GetService("Players").LocalPlayer:GetMouse()
 	end
 	local chunkFolder = ensureChunkFolder()
 	if not chunkFolder then
+		if not skipSelection then
 			clearSelection("chunk folder missing")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
@@ -285,7 +287,9 @@ function PlacementManager:Raycast()
 	local ray = Mouse.UnitRay
 	local result = workspace:Raycast(ray.Origin, ray.Direction * MAX_REACH, raycastParams)
 	if not result then
+		if not skipSelection then
 			clearSelection("raycast miss")
+		end
 		script.RaycastResult.Value = nil
 		debugPlacementLog("[PLACE][CLIENT][RAYCAST]", "miss")
 		return
@@ -293,7 +297,9 @@ function PlacementManager:Raycast()
 
 	local objLookingAt = result.Instance
 	if not objLookingAt then
+		if not skipSelection then
 			clearSelection("raycast nil instance")
+		end
 		script.RaycastResult.Value = nil
 		debugPlacementWarn("[PLACE][CLIENT][RAYCAST]", "nil instance in result")
 		return
@@ -308,7 +314,9 @@ function PlacementManager:Raycast()
 			"parent",
 			objLookingAt.Parent and objLookingAt.Parent:GetFullName() or "nil"
 		)
+		if not skipSelection then
 			clearSelection("target not in chunk folder")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
@@ -318,7 +326,9 @@ function PlacementManager:Raycast()
 			"chunk flagged ns",
 			hitChunkFolder:GetFullName()
 		)
+		if not skipSelection then
 			clearSelection("target chunk marked ns")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
@@ -327,7 +337,9 @@ function PlacementManager:Raycast()
 	local blockRoot = findBlockRoot(objLookingAt, chunkFolder) or objLookingAt
 	local chunkName, blockName = findChunkAndBlock(blockRoot)
 	if not chunkName or not blockName then
+		if not skipSelection then
 			clearSelection("failed to resolve chunk/block")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
@@ -338,7 +350,9 @@ function PlacementManager:Raycast()
 		return Util.BlockPosStringToCoords(blockName)
 	end)
 	if not okChunk or not okBlock then
+		if not skipSelection then
 			clearSelection("failed to parse chunk/block names")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
@@ -347,7 +361,9 @@ function PlacementManager:Raycast()
 
 	-- block is being optimistically broken, do not highlight it
 	if getPendingBreak(chunkKey, blockKey) then
+		if not skipSelection then
 			clearSelection("block pending break")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
@@ -356,23 +372,29 @@ function PlacementManager:Raycast()
 	local chunk = ChunkManager:GetChunk(chunkCoords.X, chunkCoords.Y, chunkCoords.Z)
 	local blockData = chunk and chunk:GetBlockAt(blockCoords.X, blockCoords.Y, blockCoords.Z)
 	if not blockData or blockData == 0 or blockData.id == 0 then
+		if not skipSelection then
 			clearSelection("block missing/air")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
 	local blockInstance = resolveBlockInstance(chunkFolder, chunkName, blockName) or blockRoot
 	if not blockInstance then
+		if not skipSelection then
 			clearSelection("missing block instance")
+		end
 		script.RaycastResult.Value = nil
 		return
 	end
 
 	lastRaycastFailure = nil
+	if not skipSelection then
 		if lastSelectedChunkKey ~= chunkKey or lastSelectedBlockKey ~= blockKey then
 			setSelection(blockInstance, PlacementManager.ChunkFolder)
 			lastSelectedChunkKey = chunkKey
 			lastSelectedBlockKey = blockKey
 		end
+	end
 	script.RaycastResult.Value = objLookingAt
 	lastNormalId = vectorToNormalId(result.Normal)
 	debugPlacementLog(
@@ -400,6 +422,10 @@ local tickRemote = game:GetService("ReplicatedStorage").Tick
 -- FIRES REMOTE
 function PlacementManager:PlaceBlock(cx, cy, cz, x, y, z, blockId: string)
 	debugPlacementLog("[PLACE][CLIENT][PLACE_CALL]", "chunk", cx, cy, cz, "block", x, y, z, "blockId", blockId)
+	if blockId == "hand" then
+		debugPlacementWarn("[PLACE][CLIENT][REJECT]", "hand cannot place")
+		return
+	end
 	if typeof(cx) ~= "number" or typeof(cy) ~= "number" or typeof(cz) ~= "number" then
 		debugPlacementWarn("[PLACE][CLIENT][REJECT]", "chunk type", cx, cy, cz, x, y, z, blockId)
 		return
@@ -551,14 +577,16 @@ local function applyBreakBlockLocal(cx, cy, cz, x, y, z)
 	chunk:RemoveBlock(x, y, z)
 end
 
-function PlacementManager:GetBlockAtMouse(): nil | {chunk:Vector3, block: Vector3}
+function PlacementManager:GetBlockAtMouse(skipSelection: boolean?): nil | {chunk:Vector3, block: Vector3}
 	pcall(function()
-		PlacementManager:Raycast()
+		PlacementManager:Raycast(skipSelection)
 	end)
 	local selectedPart = PlacementManager:RaycastGetResult()
 	--print(selectedPart and selectedPart:GetFullName() or nil)
 	if selectedPart == nil then
+		if not skipSelection then
 			clearSelection()
+		end
 		script.RaycastResult.Value = nil
 		debugPlacementLog("[PLACE][CLIENT][TARGET]", "no selectedPart after raycast", lastRaycastFailure)
 		return nil
@@ -607,8 +635,8 @@ function PlacementManager:GetBlockAtMouse(): nil | {chunk:Vector3, block: Vector
 
 end
 
-function PlacementManager:GetTargetAtMouse(): nil | {chunk:Vector3, block: Vector3, normal: Enum.NormalId}
+function PlacementManager:GetTargetAtMouse(skipSelection: boolean?): nil | {chunk:Vector3, block: Vector3, normal: Enum.NormalId}
-	local hit = PlacementManager:GetBlockAtMouse()
+	local hit = PlacementManager:GetBlockAtMouse(skipSelection)
 	if not hit then
 		return nil
 	end
@@ -621,8 +649,8 @@ function PlacementManager:GetTargetAtMouse(): nil | {chunk:Vector3, block: Vecto
 	}
 end
 
-function PlacementManager:GetPlacementAtMouse(): nil | {chunk:Vector3, block: Vector3}
+function PlacementManager:GetPlacementAtMouse(skipSelection: boolean?): nil | {chunk:Vector3, block: Vector3}
-	local hit = PlacementManager:GetTargetAtMouse()
+	local hit = PlacementManager:GetTargetAtMouse(skipSelection)
 	if not hit then
 		return nil
 	end
@@ -647,8 +675,8 @@ function PlacementManager:GetPlacementAtMouse(): nil | {chunk:Vector3, block: Ve
 	}
 end
 
-function PlacementManager:DebugGetPlacementOrWarn()
+function PlacementManager:DebugGetPlacementOrWarn(skipSelection: boolean?)
-	local placement = PlacementManager:GetPlacementAtMouse()
+	local placement = PlacementManager:GetPlacementAtMouse(skipSelection)
 	if not placement then
 		debugPlacementWarn("[PLACE][CLIENT][REJECT]", "no placement target under mouse", lastRaycastFailure)
 	end

ReplicatedStorage/Shared/Util.lua

@@ -1,18 +1,19 @@
 local RunService = game:GetService("RunService")
 local IS_STUDIO = RunService:IsStudio()
+local ENABLE_STUDIO_LOG = false
 
 local module = {}
 
 -- Prints only when running in Studio (avoids noisy live logs)
 function module.StudioLog(...: any)
-	if not IS_STUDIO then
+	if not IS_STUDIO or not ENABLE_STUDIO_LOG then
 		return
 	end
 	print(...)
 end
 
 function module.StudioWarn(...: any)
-	if not IS_STUDIO then
+	if not IS_STUDIO or not ENABLE_STUDIO_LOG then
 		return
 	end
 	warn(...)

ServerScriptService/Actor/ClientState.lua

@@ -43,9 +43,10 @@ local function rebuildBlockCatalog()
 	for _, block in ipairs(blocksFolder:GetChildren()) do
 		local id = block:GetAttribute("n")
 		if id ~= nil then
+			local displayName = block:GetAttribute("name") or block:GetAttribute("displayName") or block:GetAttribute("dn") or block.Name
 			table.insert(blockCatalog, {
 				id = tostring(id),
-				name = block:GetAttribute("displayName") or block:GetAttribute("dn") or block.Name,
+				name = displayName,
 			})
 		end
 	end
@@ -80,9 +81,6 @@ local function sanitizeSelection(hotbar, selectedSlot)
 	if selectedSlot < 1 or selectedSlot > HOTBAR_SIZE then
 		return (#hotbar > 0) and 1 or 0
 	end
-	if not hotbar[selectedSlot] then
-		return (#hotbar > 0) and 1 or 0
-	end
 	return selectedSlot
 end
 
@@ -137,7 +135,7 @@ local function handleReplicaEvents(player: Player, replica)
 			if not hotbar then
 				return
 			end
-			if slot and slot >= 1 and slot <= HOTBAR_SIZE and hotbar[slot] then
+			if slot and slot >= 1 and slot <= HOTBAR_SIZE then
 				replica:Set({"selectedSlot"}, slot)
 			end
 		end

ServerScriptService/Actor/PlayerScale.server.lua

@@ -1,47 +0,0 @@
---!native
---!optimize 2
-
-local Players = game:GetService("Players")
-
-local SCALE = 1.3
-
-local function applyScale(character: Model)
-	if character.ScaleTo then
-		pcall(function()
-			character:ScaleTo(SCALE)
-		end)
-		return
-	end
-
-	local humanoid = character:FindFirstChildOfClass("Humanoid")
-	if not humanoid then
-		return
-	end
-
-	if humanoid.RigType == Enum.HumanoidRigType.R15 then
-		for _, name in ipairs({"BodyHeightScale", "BodyWidthScale", "BodyDepthScale", "HeadScale"}) do
-			local scaleValue = humanoid:FindFirstChild(name)
-			if scaleValue then
-				scaleValue.Value = SCALE
-			end
-		end
-	end
-end
-
-local function onCharacterAdded(character: Model)
-	character:WaitForChild("Humanoid", 5)
-	applyScale(character)
-end
-
-local function onPlayerAdded(player: Player)
-	player.CharacterAdded:Connect(onCharacterAdded)
-	if player.Character then
-		onCharacterAdded(player.Character)
-	end
-end
-
-for _, player in ipairs(Players:GetPlayers()) do
-	onPlayerAdded(player)
-end
-
-Players.PlayerAdded:Connect(onPlayerAdded)

ServerScriptService/Actor/ServerChunkManager/TerrainGen/init.lua

@@ -63,9 +63,7 @@ function TerrainGen:GetChunk(x, y, z)
 	if y == 1 then
 		for cx = 1, 8 do
 			for cz = 1, 8 do
-				--local perlin = math.noise(((x*8)+cx)/100,((z*8)+cz)/100)
+				chunk:CreateBlock(cx, 1, cz, { id = "mc:grass_block", state = {} })
-				chunk:CreateBlock(cx, 1, cz, { id = 1, state = {} })
-				--chunk:CreateBlock(x, 2, z, { id = 1, state = {} })
 			end
 		end
 	end
@@ -73,9 +71,7 @@ function TerrainGen:GetChunk(x, y, z)
 		for cx = 1, 8 do
 			for cy = 1, 8 do
 				for cz = 1, 8 do
-					--local perlin = math.noise(((x*8)+cx)/100,((z*8)+cz)/100)
+					chunk:CreateBlock(cx, cy, cz, { id = "mc:dirt_block", state = {} })
-					chunk:CreateBlock(cx, cy, cz, { id = 2, state = {} })
-					--chunk:CreateBlock(x, 2, z, { id = 1, state = {} })
 				end
 			end
 		end
@@ -93,9 +89,7 @@ function TerrainGen:GetFakeChunk(x, y, z)
 	for cy = 1,8 do
 		for cx = 1, 8 do
 			for cz = 1, 8 do
-				--local perlin = math.noise(((x*8)+cx)/100,((z*8)+cz)/100)
+				chunk:CreateBlock(cx, cy, cz, { id = "invalid", state = {} })
-				chunk:CreateBlock(cx, cy, cz, { id = -2, state = {} })
-				--chunk:CreateBlock(x, 2, z, { id = 1, state = {} })
 			end
 		end
 	end

StarterGui/Hotbar/LocalScript.client.lua

@@ -53,7 +53,7 @@ local function isTextInputFocused(): boolean
 end
 
 local function resolveSelectedSlot(slots, desired)
-	if desired and desired >= 1 and desired <= HOTBAR_SIZE and slots[desired] ~= "" then
+	if desired and desired >= 1 and desired <= HOTBAR_SIZE then
 		return desired
 	end
 	for i = 1, HOTBAR_SIZE do
@@ -146,30 +146,31 @@ function Hotbar:init()
 			names = nextNames,
 			selected = nextSelected,
 		})
-		local id = nextSlots[nextSelected] or ""
+		local rawId = nextSlots[nextSelected] or ""
+		local effectiveId = rawId ~= "" and rawId or "hand"
 		local name = ""
-		if id ~= "" then
+		if rawId ~= "" then
-			name = nextNames[id] or id
+			name = nextNames[rawId] or rawId
 		end
-		PlacementState:SetSelected(id, name)
+		PlacementState:SetSelected(effectiveId, name)
 	end
 
 	self._setSelected = function(slot: number)
 		if slot < 1 or slot > HOTBAR_SIZE then
 			return
 		end
-		local info = ClientState:GetSlotInfo(slot)
-		if not info then
-			return
-		end
 		ClientState:SetSelectedSlot(slot)
 		self:setState({
 			selected = slot,
 		})
-		local id = tostring(info.id)
+		local rawId = self.state.slots[slot] or ""
-		local name = info.name or id
+		local effectiveId = rawId ~= "" and rawId or "hand"
-		Util.StudioLog("[PLACE][CLIENT][SELECT]", "slot", slot, "id", id, "name", name)
+		local name = ""
-		PlacementState:SetSelected(id, name)
+		if rawId ~= "" then
+			name = self.state.names[rawId] or rawId
+		end
+		Util.StudioLog("[PLACE][CLIENT][SELECT]", "slot", slot, "id", effectiveId, "name", name)
+		PlacementState:SetSelected(effectiveId, name)
 	end
 
 	self._handleInput = function(input: InputObject, gameProcessedEvent: boolean)
@@ -207,7 +208,7 @@ function Hotbar:init()
 		elseif input.UserInputType == Enum.UserInputType.MouseButton2 then
 			Util.StudioLog("[INPUT][CLIENT]", "MouseButton2", "processed", gameProcessedEvent)
 			-- Allow click even if gameProcessedEvent (UI can set this), but only if we're actually pointing at a block
-			local mouseBlock = PM:DebugGetPlacementOrWarn()
+			local mouseBlock = PM:DebugGetPlacementOrWarn(true) -- skip selection outline on right click
 			if not mouseBlock then
 				return
 			end
@@ -249,7 +250,7 @@ function Hotbar:init()
 			return
 		end
 		local delta = direction > 0 and -1 or 1
-		local nextSlot = math.clamp(self.state.selected + delta, 1, HOTBAR_SIZE)
+		local nextSlot = ((self.state.selected - 1 + delta) % HOTBAR_SIZE) + 1
 		if nextSlot ~= self.state.selected then
 			self._setSelected(nextSlot)
 		end
@@ -268,12 +269,13 @@ function Hotbar:didMount()
 	self._syncFromClientState()
 	self:_refreshViewports()
 	-- initialize selection broadcast
-	local id = self.state.slots and self.state.slots[self.state.selected] or ""
+	local rawId = self.state.slots and self.state.slots[self.state.selected] or ""
+	local effectiveId = rawId ~= "" and rawId or "hand"
 	local name = ""
-	if id ~= "" and self.state.names then
+	if rawId ~= "" and self.state.names then
-		name = self.state.names[id] or id
+		name = self.state.names[rawId] or rawId
 	end
-	PlacementState:SetSelected(id, name)
+	PlacementState:SetSelected(effectiveId, name)
 end
 
 function Hotbar:willUnmount()
@@ -313,6 +315,7 @@ function Hotbar:render()
 	for i = 1, HOTBAR_SIZE do
 		local id = self.state.slots[i] or ""
 		local isSelected = i == self.state.selected
+		local displayName = id ~= "" and (self.state.names and self.state.names[id] or id) or ""
 
 		slotElements[`Slot{i-1}`] = Roact.createElement("TextButton", {
 			Size = UDim2.fromOffset(50, 50),
@@ -344,7 +347,7 @@ function Hotbar:render()
 			}),
 			IndexLabel = Roact.createElement("TextLabel", {
 				BackgroundTransparency = 1,
-				Position = UDim2.fromOffset(4, 2),
+				Position = UDim2.fromOffset(8, 4),
 				Size = UDim2.fromOffset(18, 14),
 				Font = Enum.Font.Gotham,
 				Text = i == 10 and "0" or tostring(i),
@@ -358,7 +361,7 @@ function Hotbar:render()
 				Position = UDim2.fromOffset(4, 26),
 				Size = UDim2.new(1, -8, 0, 18),
 				Font = Enum.Font.GothamBold,
-				Text = id,
+				Text = displayName,
 				TextColor3 = colors.text,
 				TextSize = 15,
 				TextWrapped = true,
@@ -411,6 +414,7 @@ function Hotbar:render()
 		BorderSizePixel = 0,
 		Position = UDim2.new(0.5, 0, 1, -80-10),
 		Size = UDim2.fromOffset(0, 25),
+		Visible = selectedName ~= "",
 	}, {
 		Corner = Roact.createElement("UICorner", {
 			CornerRadius = UDim.new(0, 8),

default.project.json

@@ -23,11 +23,7 @@
     "ServerScriptService": {
       "$className": "ServerScriptService",
       "$ignoreUnknownInstances": true,
-      "$path": "ServerScriptService",
+      "$path": "ServerScriptService"
-
-      "RealismServer": {
-        "$path": "ThirdParty/Character-Realism/Realism.server.lua"
-      }
     },
 
     "StarterGui": {
@@ -43,11 +39,7 @@
       "StarterPlayerScripts": {
         "$className": "StarterPlayerScripts",
         "$ignoreUnknownInstances": true,
-        "$path": "StarterPlayer/StarterPlayerScripts",
+        "$path": "StarterPlayer/StarterPlayerScripts"
-
-        "RealismClient": {
-          "$path": "ThirdParty/Character-Realism/RealismClient"
-        }
       }
     },