Update to 1.20.5 #4186

WalshyDev · 2024-05-05T13:03:29Z

Description

Relatively easy update just a bunch of enum changes for which we can just provide a compatible API for.

Proposed changes

Created a bunch of VersionedX classes, I don't really like this but it works for now. Ideally, we build a proper mapping system but for now, I think this is fine. These names have been wrong a long time, I don't see them changing much from here.

Related Issues (if applicable)

N/A

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.

Still to do

Testing finishes
Merge dough (Support 1.20.6 dough#271)
Update dough in pom.xml

github-actions · 2024-05-05T13:03:41Z

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

JustAHuman-xD

Also should this be something we maybe put in dough instead of SF itself?

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java

WalshyDev · 2024-05-05T13:23:05Z

Also should this be something we maybe put in dough instead of SF itself?

MinecraftVersion or the versioned stuff? We have a MinecraftVersion in dough, just not with the actual MC vers. The versioned classes, maybe but I don't intend for them to be around forever or widely used.

JustAHuman-xD · 2024-05-05T13:24:18Z

Also should this be something we maybe put in dough instead of SF itself?

MinecraftVersion or the versioned stuff? We have a MinecraftVersion in dough, just not with the actual MC vers. The versioned classes, maybe but I don't intend for them to be around forever or widely used.

I was meaning the versioned stuff but yeah if they're temp then it's probably fine

WalshyDev · 2024-05-05T14:32:02Z

Tests are due to mix of 1.20.6 and 1.20.4, will wait for MockBukkit

This looks alright to me on 1.20.4, not tested 1.20.6 yet since Paper is broken

src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java

J3fftw1 · 2024-05-10T17:11:57Z

MockBukkit/MockBukkit#1008

ybw0014 · 2024-06-05T12:58:20Z

MockBukkit/MockBukkit#1008

PR is merged, time to have some progress?

J3fftw1 · 2024-06-05T16:09:42Z

A billion tests have failed

JustAHuman-xD · 2024-06-05T16:11:47Z

Java version issue by the look of the errors

J3fftw1 · 2024-06-05T16:12:44Z

Ah I saw an open PR for that on mockbukkit

JustAHuman-xD · 2024-06-05T16:14:20Z

I think we need to bump Java up to 21 for tests since that's what mockbukkits Java is now... Could be wrong tho

src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java

md5sha256 · 2024-08-11T09:55:01Z

Okay so tests now compiled on Java 21 (main sources still compile agains 16) and the mockbukkit version. I've also fixed the merge conflict so now all thats left for the tests to pass is dough... not entirely sure how to fix this. The ItemUtils class doesn't compile on 1.20.5+ due to the enchantments constants changes. So unless dough adopts some sort of Versioned enchantment, we'd have to make dough support 1.20.5+ exclusively for this to work.

J3fftw1 · 2024-08-11T17:17:01Z

the e2e tester also needs to be updated otherwise it will check against 1.21

ybw0014 · 2024-08-11T22:37:29Z

putting the link to MockBukkit's basePotionType PR here: MockBukkit/MockBukkit#1059

md5sha256 · 2024-08-12T10:25:35Z

putting the link to MockBukkit's basePotionType PR here: MockBukkit/MockBukkit#1059

the PR targets 1.21 though, we won't be able to use it until then...

ybw0014 · 2024-08-12T16:21:44Z

We should probably temporarily disable the tests that use the base potion type. When we work on 1.21, we re-enable and fix those tests.

J3fftw1 · 2024-08-12T18:58:17Z

We would have to disable the unit test for 1.20.5 and 1.20.6
kinda annoying

…bility/VersionedEnchantment.java Co-authored-by: J3fftw <[email protected]>

github-actions · 2024-09-09T02:53:13Z

Slimefun preview build

A Slimefun preview build is available for testing!
Commit: 00544df

https://preview-builds.walshy.dev/download/Slimefun/4186/00544df8

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!

WalshyDev · 2024-09-09T03:17:39Z

Testing is done: https://discord.com/channels/565557184348422174/565570276038017044/1282538803940163584

Planned merge date: 9/10th Sept

md5sha256

LGTM

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java

src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java

J3fftw1

LGTM after the points from YB have been addressed

src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java

* 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

…/localization/TestColorCodes.java Co-authored-by: JustAHuman-xD <[email protected]>

…Version.java Co-authored-by: ybw0014 <[email protected]>

sonarcloud · 2024-09-11T23:42:19Z

Quality Gate passed

Issues
50 New issues
0 Accepted issues

Measures
0 Security Hotspots
44.9% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

svr333

Everything looks good, should add that it's been a while since I've done mc related coding

svr333 · 2024-09-13T08:55:55Z

src/main/java/io/github/thebusybiscuit/slimefun4/utils/FireworkUtils.java

@@ -31,6 +33,8 @@ public final class FireworkUtils {
        Color.RED, Color.SILVER, Color.TEAL, Color.WHITE, Color.YELLOW
    };
    // @formatter:on
+
+    private static final EntityType firework = VersionedEntityType.FIREWORK;


Not sure why you make it a static variable when its only used once

not sure either but can be cleaned up later

svr333 · 2024-09-13T08:58:47Z

pom.xml

        <dependency>
            <groupId>io.papermc.paper</groupId>
            <artifactId>paper-api</artifactId>
-            <version>1.20.4-R0.1-20240205.114523-90</version>
+            <version>1.20.6-R0.1-SNAPSHOT</version>


-SNAPSHOT is still latest version?

yep that's latest -- probably worth pinning again once we're in .21

JustAHuman-xD

LGTM as far as I can see as long as it's been tested too!

WalshyDev requested review from a team as code owners May 5, 2024 13:03

github-actions bot added the 🧹 Chores Refactoring / Cleanup. label May 5, 2024

JustAHuman-xD requested changes May 5, 2024

View reviewed changes

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Outdated Show resolved Hide resolved

J3fftw1 suggested changes May 6, 2024

View reviewed changes

src/main/java/io/github/thebusybiscuit/slimefun4/utils/compatibility/VersionedEnchantment.java Outdated Show resolved Hide resolved

JustAHuman-xD added the 🎮 Game Update This pull request adds compatibility with a new version of Minecraft. label May 30, 2024

TheBusyBot added the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Jun 8, 2024

ybw0014 suggested changes Aug 6, 2024

View reviewed changes

src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java Outdated Show resolved Hide resolved

Lamby777 mentioned this pull request Aug 23, 2024

The plugin does not work in 1.21.1 on Aternos. #4226

Closed

5 tasks

TheBusyBot removed the ⚡ Merge Conflicts This Pull Request has merged conflicts which need to be resolved! label Sep 6, 2024

WalshyDev and others added 4 commits September 9, 2024 03:01

Update to 1.20.5

3b8b94e

Keep old isMinecraftVersion func

f0e4fed

Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/compati…

bd6c7e4

…bility/VersionedEnchantment.java Co-authored-by: J3fftw <[email protected]>

Update mockbukkit

62b3969

Update dough and move fireworkutils to registry

1330a87

WalshyDev requested review from JustAHuman-xD, J3fftw1, ybw0014 and md5sha256 September 9, 2024 02:53

Update dough to HEAD

cf98cd8

md5sha256 previously approved these changes Sep 9, 2024

View reviewed changes

ybw0014 suggested changes Sep 9, 2024

View reviewed changes

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Outdated Show resolved Hide resolved

src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java Show resolved Hide resolved

J3fftw1 added the Build tested Used to indicate the PR preview build has been tested by one of the team label Sep 9, 2024

J3fftw1 reviewed Sep 9, 2024

View reviewed changes

JustAHuman-xD requested changes Sep 9, 2024

View reviewed changes

src/test/java/io/github/thebusybiscuit/slimefun4/core/services/localization/TestColorCodes.java Outdated Show resolved Hide resolved

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Outdated Show resolved Hide resolved

ybw0014 suggested changes Sep 10, 2024

View reviewed changes

src/main/java/io/github/thebusybiscuit/slimefun4/api/MinecraftVersion.java Outdated Show resolved Hide resolved

ybw0014 mentioned this pull request Sep 11, 2024

chore: various changes to 1.20.5 branch #4240

Merged

7 tasks

chore: various changes to 1.20.5 branch (#4240)

283a896

* 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

WalshyDev dismissed md5sha256’s stale review via 283a896 September 11, 2024 23:37

WalshyDev and others added 2 commits September 12, 2024 00:39

Update src/test/java/io/github/thebusybiscuit/slimefun4/core/services…

2082304

…/localization/TestColorCodes.java Co-authored-by: JustAHuman-xD <[email protected]>

Update src/main/java/io/github/thebusybiscuit/slimefun4/api/Minecraft…

0b23a1e

…Version.java Co-authored-by: ybw0014 <[email protected]>

WalshyDev requested a review from JustAHuman-xD September 11, 2024 23:40

WalshyDev requested review from Sefiraat, svr333, Sfiguz7 and md5sha256 September 12, 2024 19:54

ybw0014 mentioned this pull request Sep 12, 2024

Update README.md #4222

Closed

5 tasks

svr333 approved these changes Sep 13, 2024

View reviewed changes

JustAHuman-xD approved these changes Sep 13, 2024

View reviewed changes

WalshyDev merged commit 4e46546 into master Sep 13, 2024
22 checks passed

WalshyDev deleted the chore/update-to-1-20-5 branch September 13, 2024 17:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to 1.20.5 #4186

Update to 1.20.5 #4186

WalshyDev commented May 5, 2024 •

edited

Loading

github-actions bot commented May 5, 2024

JustAHuman-xD left a comment

WalshyDev commented May 5, 2024

JustAHuman-xD commented May 5, 2024

WalshyDev commented May 5, 2024

J3fftw1 commented May 10, 2024

ybw0014 commented Jun 5, 2024

J3fftw1 commented Jun 5, 2024

JustAHuman-xD commented Jun 5, 2024

J3fftw1 commented Jun 5, 2024

JustAHuman-xD commented Jun 5, 2024

md5sha256 commented Aug 11, 2024 •

edited

Loading

J3fftw1 commented Aug 11, 2024

ybw0014 commented Aug 11, 2024

md5sha256 commented Aug 12, 2024

ybw0014 commented Aug 12, 2024

J3fftw1 commented Aug 12, 2024

github-actions bot commented Sep 9, 2024 •

edited

Loading

WalshyDev commented Sep 9, 2024 •

edited

Loading

md5sha256 left a comment

J3fftw1 left a comment

sonarcloud bot commented Sep 11, 2024

svr333 left a comment

svr333 Sep 13, 2024

WalshyDev Sep 13, 2024

svr333 Sep 13, 2024

WalshyDev Sep 13, 2024

JustAHuman-xD left a comment

Update to 1.20.5 #4186

Update to 1.20.5 #4186

Conversation

WalshyDev commented May 5, 2024 • edited Loading

Description

Proposed changes

Related Issues (if applicable)

Checklist

Still to do

github-actions bot commented May 5, 2024

JustAHuman-xD left a comment

Choose a reason for hiding this comment

WalshyDev commented May 5, 2024

JustAHuman-xD commented May 5, 2024

WalshyDev commented May 5, 2024

J3fftw1 commented May 10, 2024

ybw0014 commented Jun 5, 2024

J3fftw1 commented Jun 5, 2024

JustAHuman-xD commented Jun 5, 2024

J3fftw1 commented Jun 5, 2024

JustAHuman-xD commented Jun 5, 2024

md5sha256 commented Aug 11, 2024 • edited Loading

J3fftw1 commented Aug 11, 2024

ybw0014 commented Aug 11, 2024

md5sha256 commented Aug 12, 2024

ybw0014 commented Aug 12, 2024

J3fftw1 commented Aug 12, 2024

github-actions bot commented Sep 9, 2024 • edited Loading

Slimefun preview build

WalshyDev commented Sep 9, 2024 • edited Loading

md5sha256 left a comment

Choose a reason for hiding this comment

J3fftw1 left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Sep 11, 2024

Quality Gate passed

svr333 left a comment

Choose a reason for hiding this comment

svr333 Sep 13, 2024

Choose a reason for hiding this comment

WalshyDev Sep 13, 2024

Choose a reason for hiding this comment

svr333 Sep 13, 2024

Choose a reason for hiding this comment

WalshyDev Sep 13, 2024

Choose a reason for hiding this comment

JustAHuman-xD left a comment

Choose a reason for hiding this comment

WalshyDev commented May 5, 2024 •

edited

Loading

md5sha256 commented Aug 11, 2024 •

edited

Loading

github-actions bot commented Sep 9, 2024 •

edited

Loading

WalshyDev commented Sep 9, 2024 •

edited

Loading