Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update MockBukkit to 1.20.4 along with existing tests #4086

Merged
merged 6 commits into from
Jan 15, 2024

Conversation

J3fftw1
Copy link
Contributor

@J3fftw1 J3fftw1 commented Jan 10, 2024

Description

This PR updates mockbukkit.
It was a huge pain

Proposed changes

Make main class not final
Changed dependency order(this apparently matters a lot. Dont ask me why)
Changed grass material to grass_block. in 1.20.4 grass isnt a thing anymore. We should be using grass only in mocks so this shouldnt effect anything

Related Issues (if applicable)

Checklist

  • 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 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
  • I added sufficient Unit Tests to cover my code.

ToDo

  • Write up a doc on how to continue forward with mockbukkit
  • Fix all tests
  • Clean up pom.xml, restructure it
    • Update dough
    • Update MockBukkit
  • Possibly remove the comma true/ new constructor in main class
  • Update Spigot to 1.20.4 or later if later releases before merge
  • Rewrite history

@github-actions github-actions bot added the 🧹 Chores Refactoring / Cleanup. label Jan 10, 2024
Copy link
Contributor

Your Pull Request was automatically labelled as: "🧹 Chores"
Thank you for contributing to this project! ❤️

@J3fftw1 J3fftw1 added the ⚠BLOCKED This pull request is currently blocked from merging for technical reasons. label Jan 11, 2024
Copy link
Contributor

github-actions bot commented Jan 13, 2024

Slimefun preview build

A Slimefun preview build is available for testing!
Commit: 43d99917

https://preview-builds.walshy.dev/download/Slimefun/4086/43d99917

Note: This is not a supported build and is only here for the purposes of testing.
Do not run this on a live server and do not report bugs anywhere but this PR!

@J3fftw1 J3fftw1 force-pushed the chore/update-mockbukkit branch 3 times, most recently from 0687be1 to 221698e Compare January 15, 2024 11:21
@J3fftw1 J3fftw1 marked this pull request as ready for review January 15, 2024 11:30
@J3fftw1 J3fftw1 requested review from a team as code owners January 15, 2024 11:30
@J3fftw1 J3fftw1 removed the ⚠BLOCKED This pull request is currently blocked from merging for technical reasons. label Jan 15, 2024
@WalshyDev WalshyDev force-pushed the chore/update-mockbukkit branch 3 times, most recently from 8bcad0e to 8233a54 Compare January 15, 2024 12:02
@WalshyDev WalshyDev changed the title Chore/update mockbukkit Update MockBukkit to 1.20.4 along with existing tests Jan 15, 2024
@WalshyDev WalshyDev force-pushed the chore/update-mockbukkit branch 2 times, most recently from 00dcef0 to 0f9fb1c Compare January 15, 2024 12:41
WalshyDev
WalshyDev previously approved these changes Jan 15, 2024
docs/sop/update.md Outdated Show resolved Hide resolved
docs/sop/update.md Outdated Show resolved Hide resolved
docs/sop/update.md Outdated Show resolved Hide resolved
docs/sop/update.md Outdated Show resolved Hide resolved
docs/sop/update.md Outdated Show resolved Hide resolved
Since they are all wordy things I will just commit whatever I suggested, if you disagree change stuff back
Sfiguz7
Sfiguz7 previously approved these changes Jan 15, 2024
Copy link
Member

@Sfiguz7 Sfiguz7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than what I committed above all looks good, check it again and if it's ok we're golden

docs/sop/update.md Outdated Show resolved Hide resolved
Sfiguz7
Sfiguz7 previously approved these changes Jan 15, 2024
WalshyDev
WalshyDev previously approved these changes Jan 15, 2024
docs/sop/update.md Outdated Show resolved Hide resolved
@WalshyDev WalshyDev merged commit eb4d23e into Slimefun:master Jan 15, 2024
14 checks passed
@J3fftw1 J3fftw1 deleted the chore/update-mockbukkit branch January 15, 2024 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🧹 Chores Refactoring / Cleanup.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants