Skip to content

Commit 4608f5f

Browse files
TestingPlantTestingPlant
authored
refactor: start bedwars (#930)
This reorganizes everything to help us start implementing bedwars and removes tag code that is no longer needed.
1 parent 5dd372f commit 4608f5f

51 files changed

Lines changed: 440 additions & 1528 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/publish.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
run: |
4242
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
4343
echo "HYPERION_PROXY_TAGS=ghcr.io/${{ github.repository }}/hyperion-proxy:pr-${{ github.event.pull_request.number }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
44-
echo "TAG_TAGS=ghcr.io/${{ github.repository }}/tag:pr-${{ github.event.pull_request.number }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
44+
echo "BEDWARS_TAGS=ghcr.io/${{ github.repository }}/bedwars:pr-${{ github.event.pull_request.number }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
4545
else
4646
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
47-
echo "TAG_TAGS=ghcr.io/${{ github.repository }}/tag:latest-${{ matrix.arch }},ghcr.io/${{ github.repository }}/tag:${{ github.sha }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
47+
echo "BEDWARS_TAGS=ghcr.io/${{ github.repository }}/bedwars:latest-${{ matrix.arch }},ghcr.io/${{ github.repository }}/bedwars:${{ github.sha }}-${{ matrix.arch }}" >> $GITHUB_OUTPUT
4848
fi
4949
5050
- name: Build and push hyperion-proxy
@@ -58,16 +58,16 @@ jobs:
5858
cache-to: type=gha,mode=max
5959
tags: ${{ steps.docker-tags.outputs.HYPERION_PROXY_TAGS }}
6060

61-
- name: Build and push tag
61+
- name: Build and push bedwars
6262
uses: docker/build-push-action@v5
6363
with:
6464
context: .
65-
target: tag
65+
target: bedwars
6666
platforms: ${{ matrix.platform }}
6767
push: true
6868
cache-from: type=gha
6969
cache-to: type=gha,mode=max
70-
tags: ${{ steps.docker-tags.outputs.TAG_TAGS }}
70+
tags: ${{ steps.docker-tags.outputs.BEDWARS_TAGS }}
7171

7272
manifest:
7373
needs: build
@@ -96,15 +96,15 @@ jobs:
9696
ghcr.io/${{ github.repository }}/hyperion-proxy:${{ github.sha }}
9797
outputs: type=image,name=ghcr.io/${{ github.repository }}/hyperion-proxy
9898

99-
- name: Create and push manifest for tag
99+
- name: Create and push manifest for bedwars
100100
uses: docker/build-push-action@v5
101101
with:
102102
push: true
103103
platforms: linux/amd64
104104
tags: |
105-
ghcr.io/${{ github.repository }}/tag:latest
106-
ghcr.io/${{ github.repository }}/tag:${{ github.sha }}
107-
outputs: type=image,name=ghcr.io/${{ github.repository }}/tag
105+
ghcr.io/${{ github.repository }}/bedwars:latest
106+
ghcr.io/${{ github.repository }}/bedwars:${{ github.sha }}
107+
outputs: type=image,name=ghcr.io/${{ github.repository }}/bedwars
108108

109109
- name: Update test server
110110
env:

‎Cargo.lock‎

Lines changed: 40 additions & 65 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,13 @@ members = [
3333
'crates/hyperion-proto',
3434
'crates/hyperion-proxy',
3535
'crates/hyperion-proxy-module',
36-
'crates/hyperion-rank-tree',
37-
'crates/hyperion-respawn',
3836
'crates/hyperion-scheduled',
3937
'crates/hyperion-stats',
4038
'crates/hyperion-text',
4139
'crates/hyperion-utils',
4240
'crates/packet-channel',
4341
'crates/simd-utils',
44-
'events/tag',
42+
'events/bedwars',
4543
'tools/packet-inspector',
4644
'tools/rust-mc-bot',
4745
]
@@ -196,9 +194,6 @@ path = 'crates/hyperion-permission'
196194
[workspace.dependencies.hyperion-proto]
197195
path = 'crates/hyperion-proto'
198196

199-
[workspace.dependencies.hyperion-rank-tree]
200-
path = 'crates/hyperion-rank-tree'
201-
202197
[workspace.dependencies.hyperion-scheduled]
203198
path = 'crates/hyperion-scheduled'
204199

@@ -307,8 +302,8 @@ git = 'https://github.com/TestingPlant/valence'
307302
branch = 'feat-bytes'
308303
git = 'https://github.com/TestingPlant/valence'
309304

310-
[workspace.dependencies.tag]
311-
path = "events/tag"
305+
[workspace.dependencies.bedwars]
306+
path = "events/bedwars"
312307

313308
[workspace.dependencies.rust-mc-bot]
314309
path = "tools/rust-mc-bot"

‎Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN --mount=type=cache,target=${CARGO_HOME}/registry \
8282
cargo build --profile release-full --frozen --workspace && \
8383
mkdir -p /app/build && \
8484
cp target/release-full/hyperion-proxy /app/build/ && \
85-
cp target/release-full/tag /app/build/ && \
85+
cp target/release-full/bedwars /app/build/ && \
8686
cp target/release-full/rust-mc-bot /app/build/
8787

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

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

118118
FROM runtime-base AS rust-mc-bot
119119
COPY --from=build-release /app/build/rust-mc-bot /

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ https://github.com/user-attachments/assets/64a4a8c7-f375-4821-a1c7-0efc69c1ae0b
2626
| 📊 Performance Tracing | ✅ Implemented | Using Tracy profiler |
2727
| 🛡️ Basic Anti-Cheat | ✅ Implemented | Core anti-cheat functionality |
2828
| 🔧 Moderator Tools | 🚧 WIP [#425](https://github.com/andrewgazelka/hyperion/issues/425), [@Kumpelinus](https://github.com/Kumpelinus) | Admin controls and monitoring |
29-
| 🔌 Plugin API | ✅ Implemented | Extensible plugin system; see [`events/tag`](https://github.com/andrewgazelka/hyperion/tree/main/events/tag) |
29+
| 🔌 Plugin API | ✅ Implemented | Extensible plugin system; see [`events/bedwars`](https://github.com/hyperion-mc/hyperion/tree/main/events/bedwars) |
3030
| **Core Game Mechanics** | | |
3131
| 🧱 Block Breaking/Placing | ✅ Implemented | Including physics simulation |
3232
| 💫 Entity Collisions | ✅ Implemented | Both entity-entity and block-entity |

‎crates/hyperion-rank-tree/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎crates/hyperion-rank-tree/Cargo.toml‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎crates/hyperion-rank-tree/README.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)