Crate unification (#88)

* move client/server/config into shared

* move platforms into shared

* move head drops into shared

* move tb_entities to shared

* reduce server to just a call into shared

* get solo play working

* fix server opening window

* fix fmt

* extracted a few more modules from client

* near completely migrated client

* fixed duplicate CharacterInputEnabled definition

* simplify a few things related to builds

* more simplifications

* fix warnings/check

* ci update

* address comments

* try fixing macos steam build

* address comments

* address comments

* CI tweaks with default client feature

---------

Co-authored-by: PROMETHIA-27 <electriccobras@gmail.com>
This commit is contained in:
extrawurst
2025-12-18 18:31:22 +01:00
committed by GitHub
parent c80129dac1
commit 7cfae285ed
100 changed files with 1099 additions and 1791 deletions

View File

@@ -23,13 +23,12 @@ jobs:
- name: Build
run: |
cargo build --release --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded --no-default-features --features shared/client
cargo build --release --locked --target=x86_64-unknown-linux-gnu --bin server --no-default-features --features shared/server
cargo build --release --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded
- name: Archive
run: |
cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded target/x86_64-unknown-linux-gnu/release/server ./
tar -czf steamos.tar.gz hedz_reloaded server
cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded ./
tar -czf steamos.tar.gz hedz_reloaded
- uses: actions/upload-artifact@v4
with:

View File

@@ -27,14 +27,13 @@ jobs:
- name: Build binaries (Windows)
run: |
cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin hedz_reloaded --no-default-features --features shared/client
cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin server --no-default-features --features shared/server
cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin hedz_reloaded
- name: Archive
run: |
ls -lisa target/x86_64-pc-windows-msvc/release/
cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe target/x86_64-pc-windows-msvc/release/server.exe ./
tar -czf win.tar.gz hedz_reloaded.exe server.exe
cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe ./
tar -czf win.tar.gz hedz_reloaded.exe
- uses: actions/upload-artifact@v4
with:

View File

@@ -38,12 +38,10 @@ jobs:
- name: Build
run: |
cargo build --bin hedz_reloaded --no-default-features --features shared/client
cargo build --bin server --no-default-features --features shared/server
cargo build --bin hedz_reloaded
cargo build --bin hedz_reloaded_server --no-default-features
- name: Tests
run: |
cargo test --lib shared --no-default-features --features client
cargo test --lib shared --no-default-features --features server
cargo test --bin hedz_reloaded --no-default-features --features shared/client
cargo test --bin server --no-default-features --features shared/server
cargo test --lib hedz_reloaded
cargo test --lib hedz_reloaded --no-default-features

View File

@@ -23,11 +23,11 @@ jobs:
- name: Build client
run: |
cargo build --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded --no-default-features --features shared/client
cargo build --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded
- name: Build server
run: |
cargo build --locked --target=x86_64-unknown-linux-gnu --bin server --no-default-features --features shared/server
cargo build --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded_server --no-default-features
- name: Lints
run: |
@@ -35,8 +35,8 @@ jobs:
- name: Archive
run: |
cp target/x86_64-unknown-linux-gnu/debug/hedz_reloaded target/x86_64-unknown-linux-gnu/debug/server ./
tar -czf steamos-debug.tar.gz hedz_reloaded server
cp target/x86_64-unknown-linux-gnu/debug/hedz_reloaded target/x86_64-unknown-linux-gnu/debug/hedz_reloaded_server ./
tar -czf steamos-debug.tar.gz hedz_reloaded hedz_reloaded_server
- uses: actions/upload-artifact@v4
with:

View File

@@ -22,17 +22,14 @@ jobs:
- name: Build (lipo)
run: |
cargo build --release --target=x86_64-apple-darwin --bin hedz_reloaded --no-default-features --features shared/client
cargo build --release --target=x86_64-apple-darwin --bin server --no-default-features --features shared/server
cargo build --release --target=aarch64-apple-darwin --bin hedz_reloaded --no-default-features --features shared/client
cargo build --release --target=aarch64-apple-darwin --bin server --no-default-features --features shared/server
cargo build --release --target=x86_64-apple-darwin --bin hedz_reloaded
cargo build --release --target=aarch64-apple-darwin --bin hedz_reloaded
lipo -create -output target/release/hedz_reloaded target/aarch64-apple-darwin/release/hedz_reloaded target/x86_64-apple-darwin/release/hedz_reloaded
lipo -create -output target/release/server target/aarch64-apple-darwin/release/server target/x86_64-apple-darwin/release/server
- name: Archive
run: |
cp target/release/hedz_reloaded target/release/server ./
tar -czf hedz-macos.tar.gz hedz_reloaded server
cp target/release/hedz_reloaded ./
tar -czf hedz-macos.tar.gz hedz_reloaded
ls -lisah hedz-macos.tar.gz
- uses: actions/upload-artifact@v4
@@ -63,7 +60,7 @@ jobs:
rm -rf $APP_ROOT/* | true
mkdir -p $APP_ROOT/assets
cp -r assets/* $APP_ROOT/assets
cp hedz_reloaded server $APP_ROOT/
cp hedz_reloaded $APP_ROOT/
cp build/macos/libsteam_api.dylib $APP_ROOT/
- uses: ./.github/actions/steamcmd
@@ -114,13 +111,12 @@ jobs:
- name: Build
run: |
cargo build --locked --release --target=x86_64-unknown-linux-gnu --bin hedz_reloaded --no-default-features --features shared/client
cargo build --locked --release --target=x86_64-unknown-linux-gnu --bin server --no-default-features --features shared/server
cargo build --locked --release --target=x86_64-unknown-linux-gnu --bin hedz_reloaded
- name: Archive
run: |
cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded target/x86_64-unknown-linux-gnu/release/server ./
tar -czf steamos.tar.gz hedz_reloaded server
cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded ./
tar -czf steamos.tar.gz hedz_reloaded
- uses: actions/upload-artifact@v4
with:
@@ -130,7 +126,7 @@ jobs:
- name: Copy Binary for SteamOS
run: |
mkdir -p build/steamos/content
cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded target/x86_64-unknown-linux-gnu/release/server build/steamos/content/
cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded build/steamos/content/
- name: Install SteamCMD
run: |
@@ -196,13 +192,12 @@ jobs:
- name: Build binaries (Windows)
run: |
cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin hedz_reloaded --no-default-features --features shared/client
cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin server --no-default-features --features shared/server
cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin hedz_reloaded
- name: Move binary
run: |
ls -lisa target/x86_64-pc-windows-msvc/release/
cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe target/x86_64-pc-windows-msvc/release/server.exe build/win/
cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe build/win/
- uses: ./.github/actions/steamcmd
with: