Skip to content

Commit

Permalink
Merge branch 'Snowiiii:master' into feat/schemas
Browse files Browse the repository at this point in the history
  • Loading branch information
DataM0del authored Dec 6, 2024
2 parents f4397ae + 3143f73 commit f0dd4e4
Show file tree
Hide file tree
Showing 226 changed files with 36,523 additions and 440,038 deletions.
28 changes: 14 additions & 14 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
name: Bug report
description: Create a bug report to help us improve
name: "Bug report"
description: "Create a bug report to help us improve"
labels: ["bug"]
assignees: Snowiiii
body:
- type: checkboxes
id: duplicate
attributes:
label: I've searched existing issues and couldn't find a duplicate.
description: I confirm this is not a duplicate.
label: "I've searched existing issues and couldn't find a duplicate."
description: "I confirm this is not a duplicate."
options:
- label: I confirm this is not a duplicate.
- label: "I confirm this is not a duplicate."
required: true
- type: input
id: os
attributes:
label: Operating System
description: What operating system are you using?
description: "What operating system are you using?"
placeholder: "Example: macOS Big Sur"
validations:
required: true
- type: input
id: version
attributes:
label: Server Software Version/Commit
description: What Server Software Version/Commit are you using?
label: "Server Software Version/Commit"
description: "What Server Software Version/Commit are you using?. (Tip: Use the /pumpkin command)"
placeholder: "Example: 1.0.0/39b4cb3"
validations:
required: true
- type: textarea
id: what-happened
attributes:
label: What happened?
description: A clear and concise description of what the bug is.
label: "What happened?"
description: "A clear and concise description of what the bug is."
validations:
required: true
- type: textarea
id: to-reproduce
attributes:
label: To Reproduce
description: Steps to reproduce the behavior
label: "To Reproduce"
description: "Steps to reproduce the behavior"
validations:
required: true
- type: textarea
id: expected-behavior
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
label: "Expected behavior"
description: "A clear and concise description of what you expected to happen."
validations:
required: true
5 changes: 4 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
<!-- Please use Markdown Checkboxes.
[ ] = not done
[x] = done
(or just click checkboxes to toggle them)
-->
## Checklist
Things need to be done before this Pull Request can be merged.

- [ ] Code is well-formatted and adheres to project style guidelines: `cargo fmt`
- [ ] Code does not produce any clippy warnings `cargo clippy`
- [ ] Code does not produce any clippy warnings: `cargo clippy`
- [ ] All unit tests pass: `cargo test`
- [ ] I added new unit tests, so other people don't accidentally break my code by changing other parts of the codebase. [How?](https://doc.rust-lang.org/book/ch11-01-writing-tests.html)
47 changes: 47 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: deploy-docker-image

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

on:
push:
branches:
- "master"

jobs:
docker-build-deploy:
runs-on: ubuntu-latest

permissions:
contents: read
packages: write
attestations: write
id-token: write

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Login to GitHub CR
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract Metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Build and Push
uses: docker/build-push-action@v6
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ Cargo.lock
plugins/*
world/*

# docker-compose
data/*

# project's configurations
configuration.toml
features.toml
Expand All @@ -122,3 +125,8 @@ docs/.vitepress/cache
node_modules

run/

# Benchmarking
*perf.data*
*flamegraph.svg

11 changes: 11 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,19 @@ members = [
version = "0.1.0"
edition = "2021"

[profile.dev.package."*"]
opt-level = 3

[profile.dev]
opt-level = 1

[profile.release]
lto = true
codegen-units = 1

[profile.bench]
debug = true

[profile.profiling]
inherits = "release"
debug = true
Expand All @@ -41,6 +50,8 @@ thiserror = "2"
num-traits = "0.2"
num-derive = "0.4"

bytes = "1.8"

# Concurrency/Parallelism and Synchronization
rayon = "1.10.0"
parking_lot = { version = "0.12.3", features = ["send_guard"] }
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
![CI](https://github.com/Snowiiii/Pumpkin/actions/workflows/rust.yml/badge.svg)
[![Discord](https://img.shields.io/discord/1268592337445978193.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/wT8XjrjKkf)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
![Current version)](https://img.shields.io/badge/current_version-1.21.3-blue)
![Current version)](https://img.shields.io/badge/current_version-1.21.4-blue)

</div>

Expand Down Expand Up @@ -40,18 +40,19 @@ and customizable experience. It prioritizes performance and player enjoyment whi
- Player Configuration
- [x] Registries (biome types, paintings, dimensions)
- [x] Server Brand
- [ ] Server Links
- [x] Server Links
- [x] Set Resource Pack
- [ ] Cookies
- [x] Cookies
- World
- [x] World Joining
- [x] Player Tab-list
- [x] World Loading
- [x] Lighting
- [x] Entity Spawning
- [x] Bossbar
- [x] Chunk Loading
- [x] Chunk Generation
- [ ] World Time
- [x] World Time
- [x] Scoreboard
- [x] World Borders
- [ ] World Saving
Expand Down
20 changes: 20 additions & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Security Policy

## Reporting a Vulnerability

**Please do not report security vulnerabilities through public GitHub issues.**

Instead, please send email to [email protected]

You should receive a response within 48 hours.

Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
- Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
- Full paths of source file(s) related to the manifestation of the issue
- The location of the affected source code (tag/branch/commit or direct URL)
- Any special configuration required to reproduce the issue
- Step-by-step instructions to reproduce the issue
- Proof-of-concept or exploit code (if possible)
- Impact of the issue, including how an attacker might exploit the issue

**We prefer all communications to be in English.**
Loading

0 comments on commit f0dd4e4

Please sign in to comment.