[pull] master from Slimefun:master #869
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
* 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 <37039432+Sfiguz7@users.noreply.github.com>
…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 <37039432+Sfiguz7@users.noreply.github.com>
* update changelog && revert dependency update * Update CHANGELOG.md --------- Co-authored-by: Daniel Walsh <walshydev@gmail.com>
Apparently GitHub Actions does not like this? Thought I had used this previously but alright
Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com>
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
* Actually check if the negative tests do their job * Changed comments * walshys suggestion --------- Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
…p` and `SlimefunItemStack` (#4179)
Resolves #4183 * Fix ChargingBench - ChargingBench can now only recharge ItemStacks with 1 item. --------- Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com> Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
**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 <44972470+J3fftw1@users.noreply.github.com> * 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 <65748158+JustAHuman-xD@users.noreply.github.com> * Update src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Co-authored-by: ybw0014 <i@guizhanss.com> --------- Co-authored-by: J3fftw <44972470+J3fftw1@users.noreply.github.com> Co-authored-by: Andrew Wong <42793301+md5sha256@users.noreply.github.com> Co-authored-by: ybw0014 <i@guizhanss.com> Co-authored-by: JustAHuman-xD <65748158+JustAHuman-xD@users.noreply.github.com>
* chore(jitpack): bump jdk version to 21 * chore: trigger ci * feat: setup maven
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 : )