Merge pull request #9 from ImAvafe/dev

1.0.1

Author: ImAvafe

.github/workflows/ci.yaml

@@ -2,20 +2,18 @@ name: Releases
 
 on: push
 
-jobs: 
-
+jobs:
   deploy:
     if: ${{ github.ref == 'refs/heads/main' }}
     runs-on: ubuntu-latest
 
-
     steps:
       - name: Checkout Main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Aftman
-        uses: ok-nick/setup-aftman@v0
-        with: 
+        uses: ok-nick/setup-aftman@v0.4.2
+        with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Aftman Toolchains
@@ -28,27 +26,26 @@ jobs:
         run: mkdir -p Packages
 
       - name: Run Selene
-        run : selene src
+        run: selene src
 
       - name: Build package rbxm
         run: rojo build -o NeoHotbar.rbxm pack.project.json
 
       - name: Upload package rbxm as build artifact
-        uses: actions/upload-artifact@v3
-        with: 
+        uses: actions/upload-artifact@v4
+        with:
           name: NeoHotbar
           path: NeoHotbar.rbxm
 
       - name: Get Release from wally.toml
         uses: SebRollen/toml-action@v1.0.0
         id: read_toml
-        with: 
-          file: 'wally.toml'
-          field: 'package.version'
-
+        with:
+          file: "wally.toml"
+          field: "package.version"
 
       - name: Publish to Wally
-        env: 
+        env:
           WALLY_TOKEN: ${{ secrets.WALLY_AUTH_TOKEN }}
         run: |
           mkdir =p ~/.wally
@@ -57,31 +54,31 @@ jobs:
 
       - name: Release
         uses: softprops/action-gh-release@v1
-        with: 
+        with:
           name: ${{ steps.read_toml.outputs.value }}
           tag_name: ${{ steps.read_toml.outputs.value }}
           files: NeoHotbar.rbxm
           generate_release_notes: true
           draft: true
 
-  development: 
+  development:
     if: ${{ github.ref == 'refs/heads/dev' }}
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout development
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Aftman
-        uses: ok-nick/setup-aftman@v0
-        with: 
+        uses: ok-nick/setup-aftman@v0.4.2
+        with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Install Aftman Toolchains
         run: aftman install
 
       - name: Run Selene
-        run : selene src
+        run: selene src
 
       - name: Install Dependencies
         run: wally install
@@ -93,7 +90,7 @@ jobs:
         run: rojo build -o test-pack.rbxm pack.project.json
 
       - name: Upload test-pack.rbxm as build artifact
-        uses: actions/upload-artifact@v3
-        with: 
+        uses: actions/upload-artifact@v4
+        with:
           name: NeoHotbar
-          path: test-pack.rbxm
+          path: test-pack.rbxm

src/Components/Hotbar.lua

@@ -33,26 +33,28 @@ return function(Props: table)
 					end),
 
 					[Children] = ForPairs(States.CustomButtons, function(ButtonNum, ButtonEntry)
-						return ButtonNum, CustomButton {
-							Icon = ButtonEntry.Icon,
-							Callback = ButtonEntry.Callback,
-							LayoutOrder = ButtonEntry,
-							GamepadKeybind = ButtonEntry.GamepadKeybind,
-						}
+						return ButtonNum,
+							CustomButton {
+								Icon = ButtonEntry.Icon,
+								Callback = ButtonEntry.Callback,
+								LayoutOrder = ButtonEntry.LayoutOrder,
+								GamepadKeybind = ButtonEntry.GamepadKeybind,
+							}
 					end, Fusion.cleanup),
 				},
 				[Child "ToolSlots"] = {
 					[Children] = ForPairs(States.ToolSlots, function(ToolNum, ToolSlot)
-						return ToolNum, ToolButton {
-							Tool = ToolSlot.Tool,
-							Equipped = ToolSlot.Equipped,
-							ToolNumber = ToolNum,
-							LayoutOrder = ToolNum,
-						}
+						return ToolNum,
+							ToolButton {
+								Tool = ToolSlot.Tool,
+								Equipped = ToolSlot.Equipped,
+								ToolNumber = ToolNum,
+								LayoutOrder = ToolNum,
+							}
 					end, Fusion.cleanup),
 				},
 			},
-			
+
 			[Children] = {
 				ToolTip {},
 			},
@@ -89,12 +91,12 @@ return function(Props: table)
 							local CustomButtons = States.CustomButtons:get()
 							local OffsetPadding = ((#ToolSlots >= 1 and #CustomButtons >= 1) and 10) or 0
 							return UDim.new(0, OffsetPadding)
-						end)
+						end),
 					},
 				},
-			}
+			},
 		}
 	end
 
 	return Hotbar
-end
+end

stylua.toml

@@ -0,0 +1 @@
+call_parentheses = "Input"

wally.toml

@@ -1,7 +1,7 @@
 [package]
 name = "imavafe/neohotbar"
 description = "A modern, flexible hotbar for Roblox"
-version = "1.0.0"
+version = "1.0.1"
 license = "MIT"
 authors = ["Avafe"]
 
@@ -13,4 +13,4 @@ include = ["src", "src/*", "default.project.json", "wally.lock", "wally.toml"]
 
 [dependencies]
 Fusion = "elttob/fusion@0.2.0"
-FusionUtils = "hexcede/fusion-utils@0.1.2"
+FusionUtils = "hexcede/fusion-utils@0.1.2"