Skip to content
Open
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: 2 additions & 16 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,16 +1,2 @@
# Modifications to the source code should be handled by the code review team
*.java @Slimefun/code-reviewers

# Modifications to sensitive files should be reviewed by maintainers
/.github/ @Slimefun/slimefun4-maintainers
pom.xml @Slimefun/slimefun4-maintainers
CONTRIBUTING.md @Slimefun/slimefun4-maintainers

# Changes to the Issue templates need to be checked by the triage team
/.github/ISSUE_TEMPLATE/ @Slimefun/bug-testers

# Our wiki lookup file will be reviewed by the wiki staff team
/src/main/resources/wiki.json @Slimefun/wiki-staff

# This file is handled by TheBusyBiscuit (admins have overwrite access anyway)
/.github/CODEOWNERS @TheBusyBiscuit
# All changes are reviewed by the maintainers
* @Slimefun5/maintainers
15 changes: 6 additions & 9 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Slimefun4 - Code of Conduct
# Slimefun5 - Code of Conduct
### What is a Code of Conduct?
> A code of conduct is a document that establishes expectations for behavior for your project’s participants.
> Adopting, and enforcing, a code of conduct can help create a positive social atmosphere for your community.
Expand All @@ -7,8 +7,7 @@
This document should serve the purpose of outlining the behaviour we expect from any participant of the project.

## :mag_right: Scope
This Code of Conduct applies to all sections of the [Slimefun4 GitHub repository](https://github.com/Slimefun/Slimefun4), our [Slimefun GitHub organization](https://github.com/Slimefun) and all repositories owned by said organization.<br>
For our official Discord server, please refer to our article on [Discord Rules](https://github.com/Slimefun/Slimefun4/wiki/Discord-Rules).
This Code of Conduct applies to all sections of the [Slimefun5 GitHub repository](https://github.com/Slimefun5/Slimefun5) and our [Slimefun5 GitHub organization](https://github.com/Slimefun5).

Everyone who engages with this project on any of these repositories is expected to follow the Code of Conduct.<br>
This includes maintainers, contributors, sponsors and anyone who engages in the "Issues" section on GitHub.
Expand All @@ -18,8 +17,7 @@ This is an Open-Source project, anyone is welcome to engage and contribute!<br>
We generally expect users to engage in the Issues section by reporting bugs or commenting on bug reports to give additional context, help, guidance or to propose possible solutions and fixes.
Pull Requests are very much welcome and encouraged! They keep the project alive, so if you see an Issue and know how to fix it, feel free to create a Pull Request!

Issues that are considered "good first issues", indicated by the [good first issue](https://github.com/Slimefun/Slimefun4/labels/good%20first%20issue) label, are generally expected to be beginner-friendly.
And even if you shouldn't know where to start or how to proceed, our [Discord Server](https://discord.gg/slimefun) and its community will be there for you!
Issues that are considered "good first issues", indicated by the [good first issue](https://github.com/Slimefun5/Slimefun5/labels/good%20first%20issue) label, are generally expected to be beginner-friendly.

When commenting, please keep in mind that this software is offered for **free**. Don't expect to receive lightning-fast replies 24 hours a day.
Everyone here works on this project in their free time and usually has work, school, university or family to take care of, so we appreciate patience and understanding.
Expand Down Expand Up @@ -54,13 +52,12 @@ comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

You can see a list of people who are recognized as "project maintainers" for Slimefun on the Slimefun GitHub organization:<br>
https://github.com/orgs/Slimefun/people
You can see a list of people who are recognized as "project maintainers" for Slimefun on the Slimefun5 GitHub organization:<br>
https://github.com/orgs/Slimefun5/people

## :wrench: Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders (labelled on Discord as "Admins" or "Moderators") responsible for enforcement on our [Discord Server](discord.gg/slimefun).
If you want your issue to be handled discreetly, message `TheBusyBiscuit#2610` or `Walshy#9709` privately on Discord and state your concerns.
reported to the project maintainers via [GitHub Issues](https://github.com/Slimefun5/Slimefun5/issues).

All complaints will be reviewed and investigated promptly and fairly.
All community leaders are obligated to respect the privacy and security of the
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
THIS ISSUE IS INVALID.

TO REPORT A BUG, GO HERE -> https://github.com/Slimefun/Slimefun4/issues/new/choose
TO REPORT A BUG, GO HERE -> https://github.com/Slimefun5/Slimefun5/issues/new/choose
39 changes: 17 additions & 22 deletions .github/ISSUE_TEMPLATE/bug-report.yaml
Original file line number Diff line number Diff line change
@@ -1,28 +1,25 @@
name: Bug Report
description: Report a Bug or an Issue with Slimefun 4.
description: Report a Bug or an Issue with Slimefun.
labels: ['🎯 Needs testing', '🐞 Bug Report']

body:
- type: markdown
attributes:
value: |
## 👋 Welcome to the Slimefun Bug Tracker
If you need any help to identify the problem, visit our [Discord server](https://discord.gg/slimefun) and see if others experience a similar issue.
Also take a look at our [Troubleshooting Guide](https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs) and the list of [existing Issues](https://github.com/Slimefun/Slimefun4/issues).
## Bug Tracker
Take a look at our [Troubleshooting Guide](https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs) and the list of [existing Issues](https://github.com/Slimefun5/Slimefun5/issues).
<br /><strong><i>Fields marked with an asterisk (*) are required.</i></strong>
<br />

- id: checklist
type: checkboxes
attributes:
label: 'Checklist'
label: 'Checklist'
description: Please go through this checklist before creating the issue.
options:
- label: I am using the official english version of Slimefun and did not modify the jar.
required: true
- label: I downloaded the official version from the new build site [Blob Builds](https://blob.build/).
required: true
- label: I am using an up to date "DEV" (not "RC") version of Slimefun.
- label: I downloaded the latest release from [GitHub Releases](https://github.com/Slimefun5/Slimefun5/releases).
required: true
- label: I am aware that issues related to Slimefun addons need to be reported on their bug trackers and not here.
required: true
Expand All @@ -34,7 +31,7 @@ body:
validations:
required: true
attributes:
label: '📍 Description'
label: 'Description'
description: |
A clear and detailed description of what went wrong.
The more information you can provide, the easier we can handle this problem.
Expand All @@ -46,7 +43,7 @@ body:
validations:
required: true
attributes:
label: '📑 Reproduction Steps'
label: 'Reproduction Steps'
description: |
Tell us the exact steps to reproduce this issue, the more detailed the easier we can reproduce it.
placeholder: |
Expand All @@ -59,7 +56,7 @@ body:
validations:
required: true
attributes:
label: '💡 Expected Behavior'
label: 'Expected Behavior'
description: |
What were you expecting to happen?
What do you think would have been the correct behaviour?
Expand All @@ -69,7 +66,7 @@ body:
- id: media
type: textarea
attributes:
label: '📷 Screenshots / Videos'
label: 'Screenshots / Videos'
description: |
The best way to illustrate in an issue is by recording a Video or taking a Screenshot.
If you can capture any footage of the bug happening, it would help us out a lot!
Expand All @@ -79,7 +76,7 @@ body:
- id: server-log
type: input
attributes:
label: '📜 Server Log'
label: 'Server Log'
description: |
Take a look at your Server Log and upload any error messages from Slimefun to a pasting site (e.g. https://pastebin.com/).
If you are unsure about it, post your full log, you can find it under /logs/latest.log
Expand All @@ -88,7 +85,7 @@ body:
- id: error-reports
type: input
attributes:
label: '📂 `/error-reports/` folder'
label: '`/error-reports/` folder'
description: |
Check the folder `/plugins/Slimefun/error-reports/` and upload any files inside that folder to a pasting site (e.g. https://pastebin.com/).
placeholder: https://pastebin.com/...
Expand All @@ -98,23 +95,23 @@ body:
validations:
required: true
attributes:
label: '💻 Server Software'
label: 'Server Software'
description: 'Please select the software your Server is running on'
options:
- Spigot
- Paper
- Purpur
- Airplane
- Other (please specify in your description)

- id: minecraft-version
type: dropdown
validations:
required: true
attributes:
label: '🎮 Minecraft Version'
label: 'Minecraft Version'
description: 'Please select the Minecraft version of the server'
options:
- 1.21.x
- 1.20.x
- 1.19.x
- 1.18.x
Expand All @@ -127,7 +124,7 @@ body:
validations:
required: true
attributes:
label: 'Slimefun version'
label: 'Slimefun version'
description: |
**"latest" is not a version number, we need the exact version.**
We recommend running "/sf versions" and uploading a screenshot of that.
Expand All @@ -137,16 +134,14 @@ body:
- id: other-versions
type: textarea
attributes:
label: '🧭 Other plugins'
label: 'Other plugins'
description: |
If your issue is related to another plugin, make sure to include this here!
placeholder: The issue is related to plugin [...], version [...]

- type: markdown
attributes:
value: |
## ❤️ Thank you for submitting your bug report!
## Thank you for submitting your bug report!
If you find any additional info that can help to identify this problem, don't hesitate to comment on your issue!
Any additional info can help us fix this bug faster.
In the meantime, try visiting our [Discord server](https://discord.gg/slimefun).
Perhaps someone else has experienced a similar issue.
5 changes: 1 addition & 4 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Code of Conduct
url: https://github.com/Slimefun/Slimefun4/blob/master/.github/CODE_OF_CONDUCT.md
url: https://github.com/Slimefun5/Slimefun5/blob/stable/.github/CODE_OF_CONDUCT.md
about: Please read this before posting
- name: Bug Report Guidelines
url: https://github.com/Slimefun/Slimefun4/wiki/How-to-report-bugs
about: Guidelines on how to make good Bug reports
- name: Discord Server (for Questions and Suggestions)
url: https://discord.gg/slimefun
about: Please ask and answer questions here.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!-- Don't worry, these are not requirements. They only serve as guidance. -->
- [ ] I have fully tested the proposed changes and promise that they will not break everything into chaos.
- [ ] I have also tested the proposed changes in combination with various popular addons and can confirm my changes do not break them.
- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.20.*).
- [ ] I have made sure that the proposed changes do not break compatibility across the supported Minecraft versions (1.16.* - 1.21.*).
- [ ] I followed the existing code standards and didn't mess up the formatting.
- [ ] I did my best to add documentation to any public classes or methods I added.
- [ ] I have added `Nonnull` and `Nullable` annotations to my methods to indicate their behaviour for null values
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto-approve.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:
pull-requests: write

# Only run this on the main repo
if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4'
if: github.event.pull_request.head.repo.full_name == 'Slimefun5/Slimefun5'

steps:
- name: Approve via actions
uses: hmarr/auto-approve-action@v4.0.0
if: github.actor == 'TheBusyBot' || github.actor == 'renovate[bot]'
if: github.actor == 'renovate[bot]'
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
8 changes: 4 additions & 4 deletions .github/workflows/auto-squash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
runs-on: ubuntu-latest

## Only run this on the main repo
if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4'
if: github.event.pull_request.head.repo.full_name == 'Slimefun5/Slimefun5'

steps:
- name: Auto squash
uses: pascalgn/automerge-action@v0.16.4
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
UPDATE_RETRIES: 0
MERGE_METHOD: squash
MERGE_FORKS: false
Expand All @@ -38,13 +38,13 @@ jobs:
runs-on: ubuntu-latest

## Only run this on the main repo
if: github.event.pull_request.head.repo.full_name == 'Slimefun/Slimefun4'
if: github.event.pull_request.head.repo.full_name == 'Slimefun5/Slimefun5'

steps:
- name: Auto squash
uses: pascalgn/automerge-action@v0.16.4
env:
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
UPDATE_RETRIES: 0
MERGE_METHOD: squash
MERGE_FORKS: false
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/close-invalid-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
issues:
types: [opened]

permissions:
contents: read
issues: write

jobs:
comment:

Expand All @@ -15,23 +19,22 @@ jobs:
- name: Close Issue
uses: maxkomarychev/octions/octions/issues/update@master
with:
token: ${{ secrets.ACCESS_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
issue_number: ${{ github.event.issue.number }}
state: closed
- name: Add invalid label
uses: maxkomarychev/octions/octions/issues/add-labels@master
with:
token: ${{ secrets.ACCESS_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
issue_number: ${{ github.event.issue.number }}
labels: 'invalid'
- name: Create a comment
uses: maxkomarychev/octions/octions/issues/create-comment@master
with:
token: ${{ secrets.ACCESS_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
issue_number: ${{ github.event.issue.number }}
body: |-
Your issue seems to be missing our template.
[Click here to create a bug report](https://github.com/Slimefun/Slimefun4/issues/new/choose)
[Click here to create a bug report](https://github.com/Slimefun5/Slimefun5/issues/new/choose)

Please remember that this Bug Tracker is exclusively reserved for Bug reports, any other form
of discussion, like suggestions or questions should be posted on our discord server (You can find a link [on our main page](https://github.com/Slimefun/Slimefun4#discord)).
Please remember that this Bug Tracker is exclusively reserved for Bug reports.
45 changes: 0 additions & 45 deletions .github/workflows/discord-webhook.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/duplicates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ jobs:
- name: Add label to the Issue
uses: maxkomarychev/octions/octions/issues/add-labels@master
with:
token: ${{ secrets.ACCESS_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
issue_number: ${{ github.event.issue.number }}
labels: '🚩 Duplicate'
Loading