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

[pull] master from Slimefun:master #869

Open
wants to merge 48 commits into
base: master
Choose a base branch
from

Conversation

pull[bot]
Copy link

@pull pull bot commented May 19, 2024

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.1)

Can you help keep this open source service alive? 💖 Please sponsor : )

WalshyDev and others added 30 commits February 7, 2024 09:26
* Move PlayerProfile off main thread, add debugs and improve tab completion for debug

Moved the PlayerProfile saving off the main thread, we generally load this off-thread but now we also save off-thread. I thought we were already doing this but apparently not, especially with our current YAML stuff this should definitely be done

Also done a small change to ensure that we don't remove the PlayerProfile from memory if the player is still online. I don't think we ever had a reported issue from this but it's kinda weird behaviour

Finally, added some debug logs to the saving logic, this can be enabled with `sf debug slimefun_player_profile_data`. Also added auto-complete to /sf debug because it's nice, this only works for Slimefun test cases rather than addons but that's fine. Mostly internal anyway

* Update src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java

---------

Co-authored-by: Alessio Colombo <[email protected]>
…ng (#4124)

Due to a logic bug in the Legacy storage backend if there was a duplicate ID it would mark it as researched for the first, then see it researched already and remove it on the second. This was happening for the Coal Generator and Bio Reactor here. Both shared he same research ID 173.

We're just doing this fix for now until we can move away from the legacy backend (work in progress).
Co-authored-by: Alessio Colombo <[email protected]>
* update changelog && revert dependency update

* Update CHANGELOG.md

---------

Co-authored-by: Daniel Walsh <[email protected]>
Apparently GitHub Actions does not like this? Thought I had used this previously but alright
* Actually check if the negative tests do their job

* Changed comments

* walshys suggestion

---------

Co-authored-by: JustAHuman-xD <[email protected]>
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels May 19, 2024
JWJUN233233 and others added 17 commits June 8, 2024 07:53
)

* chore: include download source

* chore: let all workflow pass
Resolves #4183
* Fix ChargingBench
- ChargingBench can now only recharge ItemStacks with 1 item.

---------

Co-authored-by: J3fftw <[email protected]>
Co-authored-by: JustAHuman-xD <[email protected]>
**This build should be considered experimental for now**

* Update to 1.20.5
* Keep old isMinecraftVersion func
* Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java
Co-authored-by: J3fftw <[email protected]>

* Update mockbukkit
* Update Junit and maven plugin versions, update mockbukkit to latest for 1.20.6
* Refactor AbstractLocateRegexCheck to detect and return null if the locale file only contains the null delimiter
* Refactor to use a permission check in the TestGuideCommand
* Fix TestBiomeMapCompatibility failing due to JsonUtils neeeding Slimefun to be loaded, add biome json for 1.20.5+
* Refactor versioned classes to use the Registry api
* Mark the paper-api dependency in the provided scope
* Check if getBasePotionType can be used before using it
* Revert "Refactor versioned classes to use the Registry api"
This reverts commit b529c34.

* Refactor VersionedEntityType and VersionedEnchantment to use the registry api
* Mark the paper-api dependency in the test scope, update comment
* Refactor MinecraftVersion to include a range of minor patches which a MinecraftVersion targets
* Make tests pass and update to dough pr
* Update CI
* Update dough and move fireworkutils to registry
* Update dough to HEAD
* chore: various changes to 1.20.5 branch (#4240)
* fix: fix isBefore, also added unit tests
* chore: comments
* chore: simplify
* chore: use == for enum comparison
* chore: retrigger ci
* chore(ci): e2e on more versions
* Update src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java

Co-authored-by: JustAHuman-xD <[email protected]>

* Update src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java
Co-authored-by: ybw0014 <[email protected]>

---------

Co-authored-by: J3fftw <[email protected]>
Co-authored-by: Andrew Wong <[email protected]>
Co-authored-by: ybw0014 <[email protected]>
Co-authored-by: JustAHuman-xD <[email protected]>
* chore(jitpack): bump jdk version to 21

* chore: trigger ci

* feat: setup maven
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
Development

Successfully merging this pull request may close these issues.