1.21 #22
Merged
1.21 #22
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
**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 (Slimefun#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
…istener to use the wrapper on Player#getOpenInventory
NOTE TO FUTURE SELF: Use ForwardingObject over lombok's @DeleGate
Co-authored-by: Daniel Walsh <[email protected]>
# Conflicts: # pom.xml # src/main/java/io/github/thebusybiscuit/slimefun4/api/gps/GPSNetwork.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/CarbonPress.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricPress.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/HeatedPressureChamber.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/EnderTalisman.java # src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/talismans/Talisman.java
Walshy/mc 1.21 sfi
Signed-off-by: Garrett <[email protected]>
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.
Description
Proposed changes
Related Issues (if applicable)
Checklist
NonnullandNullableannotations to my methods to indicate their behaviour for null values