Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ jobs:
run: |
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
echo "HYPERION_PROXY_TAGS=ghcr.io/${{ github.repository }}/hyperion-proxy:pr-${{ github.event.pull_request.number }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
echo "TAG_TAGS=ghcr.io/${{ github.repository }}/tag:pr-${{ github.event.pull_request.number }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
echo "BEDWARS_TAGS=ghcr.io/${{ github.repository }}/bedwars:pr-${{ github.event.pull_request.number }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
else
echo "HYPERION_PROXY_TAGS=ghcr.io/${{ github.repository }}/hyperion-proxy:latest-${{ matrix.arch }},ghcr.io/${{ github.repository }}/hyperion-proxy:${{ github.sha }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
echo "TAG_TAGS=ghcr.io/${{ github.repository }}/tag:latest-${{ matrix.arch }},ghcr.io/${{ github.repository }}/tag:${{ github.sha }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
echo "BEDWARS_TAGS=ghcr.io/${{ github.repository }}/bedwars:latest-${{ matrix.arch }},ghcr.io/${{ github.repository }}/bedwars:${{ github.sha }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
fi

- name: Build and push hyperion-proxy
Expand All @@ -58,16 +58,16 @@ jobs:
cache-to: type=gha,mode=max
tags: ${{ steps.docker-tags.outputs.HYPERION_PROXY_TAGS }}

- name: Build and push tag
- name: Build and push bedwars
uses: docker/build-push-action@v5
with:
context: .
target: tag
target: bedwars
platforms: ${{ matrix.platform }}
push: true
cache-from: type=gha
cache-to: type=gha,mode=max
tags: ${{ steps.docker-tags.outputs.TAG_TAGS }}
tags: ${{ steps.docker-tags.outputs.BEDWARS_TAGS }}

manifest:
needs: build
Expand Down Expand Up @@ -96,15 +96,15 @@ jobs:
ghcr.io/${{ github.repository }}/hyperion-proxy:${{ github.sha }}
outputs: type=image,name=ghcr.io/${{ github.repository }}/hyperion-proxy

- name: Create and push manifest for tag
- name: Create and push manifest for bedwars
uses: docker/build-push-action@v5
with:
push: true
platforms: linux/amd64
tags: |
ghcr.io/${{ github.repository }}/tag:latest
ghcr.io/${{ github.repository }}/tag:${{ github.sha }}
outputs: type=image,name=ghcr.io/${{ github.repository }}/tag
ghcr.io/${{ github.repository }}/bedwars:latest
ghcr.io/${{ github.repository }}/bedwars:${{ github.sha }}
outputs: type=image,name=ghcr.io/${{ github.repository }}/bedwars

- name: Update test server
env:
Expand Down
105 changes: 40 additions & 65 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,13 @@ members = [
'crates/hyperion-proto',
'crates/hyperion-proxy',
'crates/hyperion-proxy-module',
'crates/hyperion-rank-tree',
'crates/hyperion-respawn',
'crates/hyperion-scheduled',
'crates/hyperion-stats',
'crates/hyperion-text',
'crates/hyperion-utils',
'crates/packet-channel',
'crates/simd-utils',
'events/tag',
'events/bedwars',
'tools/packet-inspector',
'tools/rust-mc-bot',
]
Expand Down Expand Up @@ -196,9 +194,6 @@ path = 'crates/hyperion-permission'
[workspace.dependencies.hyperion-proto]
path = 'crates/hyperion-proto'

[workspace.dependencies.hyperion-rank-tree]
path = 'crates/hyperion-rank-tree'

[workspace.dependencies.hyperion-scheduled]
path = 'crates/hyperion-scheduled'

Expand Down Expand Up @@ -307,8 +302,8 @@ git = 'https://github.com/TestingPlant/valence'
branch = 'feat-bytes'
git = 'https://github.com/TestingPlant/valence'

[workspace.dependencies.tag]
path = "events/tag"
[workspace.dependencies.bedwars]
path = "events/bedwars"

[workspace.dependencies.rust-mc-bot]
path = "tools/rust-mc-bot"
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
cargo build --profile release-full --frozen --workspace && \
mkdir -p /app/build && \
cp target/release-full/hyperion-proxy /app/build/ && \
cp target/release-full/tag /app/build/ && \
cp target/release-full/bedwars /app/build/ && \
cp target/release-full/rust-mc-bot /app/build/

# Runtime base image
Expand All @@ -105,15 +105,15 @@ ENV HYPERION_PROXY_PROXY_ADDR="0.0.0.0:25565" \
HYPERION_PROXY_SERVER="127.0.0.1:35565"
ENTRYPOINT ["/hyperion-proxy"]

FROM runtime-base AS tag
COPY --from=build-release /app/build/tag /
FROM runtime-base AS bedwars
COPY --from=build-release /app/build/bedwars /
LABEL org.opencontainers.image.source="https://github.com/andrewgazelka/hyperion" \
org.opencontainers.image.description="Hyperion Tag Event" \
org.opencontainers.image.description="Hyperion Bedwars Event" \
org.opencontainers.image.version="0.1.0"
ENV TAG_IP="0.0.0.0" \
TAG_PORT="35565"
ENV BEDWARS_IP="0.0.0.0" \
BEDWARS_PORT="35565"
EXPOSE 35565
ENTRYPOINT ["/tag"]
ENTRYPOINT ["/bedwars"]

FROM runtime-base AS rust-mc-bot
COPY --from=build-release /app/build/rust-mc-bot /
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ https://github.com/user-attachments/assets/64a4a8c7-f375-4821-a1c7-0efc69c1ae0b
| 📊 Performance Tracing | ✅ Implemented | Using Tracy profiler |
| 🛡️ Basic Anti-Cheat | ✅ Implemented | Core anti-cheat functionality |
| 🔧 Moderator Tools | 🚧 WIP [#425](https://github.com/andrewgazelka/hyperion/issues/425), [@Kumpelinus](https://github.com/Kumpelinus) | Admin controls and monitoring |
| 🔌 Plugin API | ✅ Implemented | Extensible plugin system; see [`events/tag`](https://github.com/andrewgazelka/hyperion/tree/main/events/tag) |
| 🔌 Plugin API | ✅ Implemented | Extensible plugin system; see [`events/bedwars`](https://github.com/hyperion-mc/hyperion/tree/main/events/bedwars) |
| **Core Game Mechanics** | | |
| 🧱 Block Breaking/Placing | ✅ Implemented | Including physics simulation |
| 💫 Entity Collisions | ✅ Implemented | Both entity-entity and block-entity |
Expand Down
1 change: 0 additions & 1 deletion crates/hyperion-rank-tree/.gitignore

This file was deleted.

19 changes: 0 additions & 19 deletions crates/hyperion-rank-tree/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion crates/hyperion-rank-tree/README.md

This file was deleted.

Loading