Kris-Development-Studios/block-game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hotbar: wrap

Browse Source
This commit is contained in:
Kris
2026-01-09 18:10:16 +02:00
parent 4785795640
commit bc62f8bd70
4 changed files with 81 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ReplicatedStorage/Shared/ClientState.lua
View File

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

78
ReplicatedStorage/Shared/PlacementManager.lua
View File

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

5
ServerScriptService/Actor/ClientState.lua
View File

@@ -81,9 +81,6 @@ local function sanitizeSelection(hotbar, selectedSlot)
if selectedSlot < 1 or selectedSlot > HOTBAR_SIZE then if selectedSlot < 1 or selectedSlot > HOTBAR_SIZE then
return (#hotbar > 0) and 1 or 0 return (#hotbar > 0) and 1 or 0
end end
if not hotbar[selectedSlot] then
return (#hotbar > 0) and 1 or 0
end
return selectedSlot return selectedSlot
end end
@@ -138,7 +135,7 @@ local function handleReplicaEvents(player: Player, replica)
if not hotbar then if not hotbar then
return return
end 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) replica:Set({"selectedSlot"}, slot)
end end
end end

43
StarterGui/Hotbar/LocalScript.client.lua
View File

@@ -53,7 +53,7 @@ local function isTextInputFocused(): boolean
end end
local function resolveSelectedSlot(slots, desired) 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 return desired
end end
for i = 1, HOTBAR_SIZE do for i = 1, HOTBAR_SIZE do
@@ -146,30 +146,31 @@ function Hotbar:init()
names = nextNames, names = nextNames,
selected = nextSelected, selected = nextSelected,
}) })
local id = nextSlots[nextSelected] or "" local rawId = nextSlots[nextSelected] or ""
local effectiveId = rawId ~= "" and rawId or "hand"
local name = "" local name = ""
if id ~= "" then if rawId ~= "" then
name = nextNames[id] or id name = nextNames[rawId] or rawId
end end
PlacementState:SetSelected(id, name) PlacementState:SetSelected(effectiveId, name)
end end
self._setSelected = function(slot: number) self._setSelected = function(slot: number)
if slot < 1 or slot > HOTBAR_SIZE then if slot < 1 or slot > HOTBAR_SIZE then
return return
end end
local info = ClientState:GetSlotInfo(slot)
if not info then
return
end
ClientState:SetSelectedSlot(slot) ClientState:SetSelectedSlot(slot)
self:setState({ self:setState({
selected = slot, 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 end
self._handleInput = function(input: InputObject, gameProcessedEvent: boolean) self._handleInput = function(input: InputObject, gameProcessedEvent: boolean)
@@ -207,7 +208,7 @@ function Hotbar:init()
elseif input.UserInputType == Enum.UserInputType.MouseButton2 then elseif input.UserInputType == Enum.UserInputType.MouseButton2 then
Util.StudioLog("[INPUT][CLIENT]", "MouseButton2", "processed", gameProcessedEvent) 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 -- 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 if not mouseBlock then
return return
end end
@@ -249,7 +250,7 @@ function Hotbar:init()
return return
end end
local delta = direction > 0 and -1 or 1 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 if nextSlot ~= self.state.selected then
self._setSelected(nextSlot) self._setSelected(nextSlot)
end end
@@ -268,12 +269,13 @@ function Hotbar:didMount()
self._syncFromClientState() self._syncFromClientState()
self:_refreshViewports() self:_refreshViewports()
-- initialize selection broadcast -- 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 = "" 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 end
PlacementState:SetSelected(id, name) PlacementState:SetSelected(effectiveId, name)
end end
function Hotbar:willUnmount() function Hotbar:willUnmount()
@@ -345,7 +347,7 @@ function Hotbar:render()
}), }),
IndexLabel = Roact.createElement("TextLabel", { IndexLabel = Roact.createElement("TextLabel", {
BackgroundTransparency = 1, BackgroundTransparency = 1,
Position = UDim2.fromOffset(4, 2), Position = UDim2.fromOffset(8, 4),
Size = UDim2.fromOffset(18, 14), Size = UDim2.fromOffset(18, 14),
Font = Enum.Font.Gotham, Font = Enum.Font.Gotham,
Text = i == 10 and "0" or tostring(i), Text = i == 10 and "0" or tostring(i),
@@ -412,6 +414,7 @@ function Hotbar:render()
BorderSizePixel = 0, BorderSizePixel = 0,
Position = UDim2.new(0.5, 0, 1, -80-10), Position = UDim2.new(0.5, 0, 1, -80-10),
Size = UDim2.fromOffset(0, 25), Size = UDim2.fromOffset(0, 25),
Visible = selectedName ~= "",
}, { }, {
Corner = Roact.createElement("UICorner", { Corner = Roact.createElement("UICorner", {
CornerRadius = UDim.new(0, 8), CornerRadius = UDim.new(0, 8),