diff --git a/scripts/dev.ps1 b/scripts/dev.ps1 index d01192c..20b49e7 100755 --- a/scripts/dev.ps1 +++ b/scripts/dev.ps1 @@ -57,6 +57,10 @@ function Symlink { New-Item -ItemType SymbolicLink -Path "$gitHooksDir\post-commit" -Target "$rootDir\scripts\hooks\post-commit" -Force } -Install-Packwiz +if (-not (Get-Command packwiz -ErrorAction SilentlyContinue)) { + Install-Packwiz +} else { + Write-Host "packwiz already installed, skipping installation step" +} Symlink Write-Host "Script execution completed successfully!" diff --git a/scripts/dev.sh b/scripts/dev.sh index 38e6bf2..370fb75 100755 --- a/scripts/dev.sh +++ b/scripts/dev.sh @@ -7,57 +7,61 @@ project_root=$(git rev-parse --show-toplevel) # Function to install packwiz and add it to the system path install_packwiz() { - # Download packwiz executable - wget https://seafsh.cc/u/O5JTlL -O packwiz + # Download packwiz executable + wget https://seafsh.cc/u/O5JTlL -O packwiz - # Move packwiz executable to a system directory (you may need sudo) - sudo mv packwiz /usr/local/bin/packwiz - sudo chmod +x /usr/local/bin/packwiz - sudo chmod 111 /usr/local/bin/packwiz + # Move packwiz executable to a system directory (you may need sudo) + sudo mv packwiz /usr/local/bin/packwiz + sudo chmod +x /usr/local/bin/packwiz + sudo chmod 111 /usr/local/bin/packwiz - # Add packwiz to the system path - if [[ ! ":$PATH:" == *":/usr/local/bin:"* ]]; then - echo "export PATH='$PATH:/usr/local/bin'" >> ~/.bashrc - fi + # Add packwiz to the system path + if [[ ! ":$PATH:" == *":/usr/local/bin:"* ]]; then + echo "export PATH='$PATH:/usr/local/bin'" >>~/.bashrc + fi - # Generate autocompletion script - packwiz completion bash > ~/.packwiz - if ! grep -q "source ~/.packwiz" ~/.bashrc; then - echo 'source ~/.packwiz' >> ~/.bashrc - echo "Successfully enabled packwiz autocompletion"; - else - echo "packwiz autocompletion already enabled" - fi + # Generate autocompletion script + packwiz completion bash >~/.packwiz + if ! grep -q "source ~/.packwiz" ~/.bashrc; then + echo 'source ~/.packwiz' >>~/.bashrc + echo "Successfully enabled packwiz autocompletion" + else + echo "packwiz autocompletion already enabled" + fi - source ~/.bashrc + source ~/.bashrc } # Function to create symlink for pre-commit hook create_symlink() { - # Check if .git/hooks directory exists - if [ ! -d "$project_root/.git/hooks" ]; then - mkdir -p "$project_root/.git/hooks" - fi + # Check if .git/hooks directory exists + if [ ! -d "$project_root/.git/hooks" ]; then + mkdir -p "$project_root/.git/hooks" + fi - # Delete old symlink - rm -f "$project_root/.git/hooks/post-commit" + # Delete old symlink + rm -f "$project_root/.git/hooks/post-commit" - # Create symlink for post-commit hook - ln -s "$project_root/scripts/hooks/post-commit" "$project_root/.git/hooks/post-commit" + # Create symlink for post-commit hook + ln -s "$project_root/scripts/hooks/post-commit" "$project_root/.git/hooks/post-commit" - # Verify symlink creation - ls -l "$project_root/.git/hooks/post-commit" + # Verify symlink creation + ls -l "$project_root/.git/hooks/post-commit" } # Main function main() { - # Install packwiz - install_packwiz + # Install packwiz + if ! which packwiz &>/dev/null; then + install_packwiz + else + echo "packwiz is already installed, skipping installation step" + fi - # Create symlink for pre-commit hook - create_symlink + # Create symlink for pre-commit hook + create_symlink - echo "Development environment setup complete!" + echo "Development environment setup complete!" } # Execute main function diff --git a/src/index.toml b/src/index.toml index 937c358..b70518e 100644 --- a/src/index.toml +++ b/src/index.toml @@ -59,7 +59,7 @@ hash = "35e8f0d6ee84ecf70bed440d5b26b523d2c684568f16fdc871ce934d224eec2c" [[files]] file = "kubejs/assets/capejs/textures/capes/galacticfactory.png" -hash = "23116999939851feb0b358564af45813b1e65fbd1e33d9ccfe6fac7b7027e1ad" +hash = "6fc37dfd4dbb54c8ecf293ca2178fee5953d7ffbee13eaf7b17f9922c65f8421" [[files]] file = "kubejs/assets/kubejs/ponder/farm.nbt" diff --git a/src/kubejs/assets/capejs/textures/capes/galacticfactory.png b/src/kubejs/assets/capejs/textures/capes/galacticfactory.png index f0f4c97..a28f4f0 100644 Binary files a/src/kubejs/assets/capejs/textures/capes/galacticfactory.png and b/src/kubejs/assets/capejs/textures/capes/galacticfactory.png differ diff --git a/src/pack.toml b/src/pack.toml index ce11760..1909a6f 100644 --- a/src/pack.toml +++ b/src/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "e010d772534eca85da5b65c1de99feda6507341153b423c84bfb4017c2b99821" +hash = "4a4fd86468b22e8ba56224d7d7630dc4ab018c36ee9c31d9ed669ab1ba7a12e2" [versions] forge = "47.2.0"