Support for 1.20.5/6 #2721

SirYwell · 2024-05-11T18:36:26Z

Overview

Description

### Submitter Checklist
- [x] Make sure you are opening from a topic branch (**/feature/fix/docs/ branch** (right side)) and not your main branch.
- [x] Ensure that the pull request title represents the desired changelog entry.
- [x] New public fields and methods are annotated with `@since TODO`.
- [x] I read and followed the [contribution guidelines](https://github.com/IntellectualSites/.github/blob/main/CONTRIBUTING.md).

Signed-off-by: Alexander Brandes <mc.cache@web.de>

# Conflicts: # buildSrc/build.gradle.kts

scarfacered · 2024-05-11T19:15:06Z

I receive this error when running //wand

[Craft Scheduler Thread - 3 - FastAsyncWorldEdit/ERROR]: An unexpected error while handling a FastAsyncWorldEdit command
java.lang.IllegalStateException: Not a map: null
	at com.mojang.serialization.DataResult$Error.getOrThrow(DataResult.java:275) ~[datafixerupper-7.0.14.jar:?]
	at com.mojang.serialization.DataResult.getOrThrow(DataResult.java:79) ~[datafixerupper-7.0.14.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.bukkit.adapter.impl.fawe.v1_20_R4.PaperweightFaweAdapter.adapt(PaperweightFaweAdapter.java:501) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.bukkit.BukkitAdapter.adapt(BukkitAdapter.java:495) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.bukkit.BukkitPlayer.giveItem(BukkitPlayer.java:163) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.extension.platform.PlayerProxy.giveItem(PlayerProxy.java:84) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.command.SelectionCommands.wand(SelectionCommands.java:337) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.command.SelectionCommandsRegistration.cmd$_wand(SelectionCommandsRegistration.java:409) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/org.enginehub.piston.CommandManager.execute(CommandManager.java:157) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.extension.platform.PlatformCommandManager.lambda$handleCommandOnCurrentThread$16(PlatformCommandManager.java:725) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.extension.platform.PlatformCommandManager.handleCommandTask(PlatformCommandManager.java:746) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.extension.platform.PlatformCommandManager.handleCommandOnCurrentThread(PlatformCommandManager.java:727) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar/com.sk89q.worldedit.extension.platform.PlatformCommandManager.lambda$handleCommand$13(PlatformCommandManager.java:690) ~[FastAsyncWorldEdit-Bukkit-2.9.3-SNAPSHOT.jar:?]
	at org.bukkit.craftbukkit.scheduler.CraftTask.run(CraftTask.java:101) ~[paper-1.20.6.jar:git-Paper-"447f9a1"]
	at org.bukkit.craftbukkit.scheduler.CraftAsyncTask.run(CraftAsyncTask.java:57) ~[paper-1.20.6.jar:git-Paper-"447f9a1"]
	at com.destroystokyo.paper.ServerSchedulerReportingWrapper.run(ServerSchedulerReportingWrapper.java:22) ~[paper-1.20.6.jar:?]
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1144) ~[?:?]
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:642) ~[?:?]
	at java.base/java.lang.Thread.run(Thread.java:1583) ~[?:?]

rwnd-bradley · 2024-05-12T07:44:34Z

Fails to build with ./gradlew clean build:

FastAsyncWorldEdit\worldedit-bukkit\src\main\java\com\sk89q\bukkit\util\CommandRegistration.java:103: error: constructor SimpleCommandMap in class SimpleCommandMap cannot be applied to given types;
            fallbackCommands = commandMap = new SimpleCommandMap(Bukkit.getServer());
                                            ^
  required: Server,Map<String,Command>
  found:    Server
  reason: actual and formal argument lists differ in length

However, the actions built jar is working well from my testing 😄

SirYwell · 2024-05-12T08:42:42Z

Seems like Paper broke API compatibility with PaperMC/Paper#8235

github-actions · 2024-05-12T10:07:13Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

# Conflicts: # worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

github-actions · 2024-05-13T02:02:18Z

Please take a moment and address the merge conflicts of your pull request. Thanks!

NotMyFault

Is this ready to be merged?

SirYwell · 2024-05-19T10:26:27Z

I think so

Remove a redundant passenger check, as entity.save() returns false in that case. This also causes leash knots to not be copied. I don't think this is a problem because: - They would not be saved to disk, it's misleading for users that they appear. - Pasted leashed mobs still think they're leashed to the original position and get unleashed* - no change in behaviour. \* Unless they're pasted close enough to the original position, in which case this has better behaviour because they create their own leash_knot entity.

* Merge pull request EngineHub/WorldEdit#2740 from ssquadteam/version/7.3.x Add ability to copy state string from info tool Co-authored-by: ssquadteam <sahib.2009.sa@gmail.com> * Update enum-like classes with 1.21.5-rc1 data from MCUtils * Do not paste unsaveable entities in their default state (#2721) Remove a redundant passenger check, as entity.save() returns false in that case. This also causes leash knots to not be copied. I don't think this is a problem because: - They would not be saved to disk, it's misleading for users that they appear. - Pasted leashed mobs still think they're leashed to the original position and get unleashed* - no change in behaviour. \* Unless they're pasted close enough to the original position, in which case this has better behaviour because they create their own leash_knot entity. * Update click and hover text component serialization for 1.21.5. (#2757) Hacky workaround by overwriting the text3 StyleSerializer class with our own modified copy. Note that the hover events "show_entity" and "show_item" aren't supported as they no longer take a rendered component, but just the NBT structure. Behavior remains unchanged if 1.21.4- is detected. Fixes #2756. * Add text3 bukkit adapter override for Spigot gson change. (#2759) * Make SpigotAdapter compatible with pre 1.21.5 api --------- Co-authored-by: Octavia Togami <octavia.togami@gmail.com> Co-authored-by: ssquadteam <sahib.2009.sa@gmail.com> Co-authored-by: Maddy Miller <git@madelinemiller.dev> Co-authored-by: brickmonster <92665597+brickmonster@users.noreply.github.com> Co-authored-by: wizjany <wizjany@gmail.com> Co-authored-by: SirYwell <hannesgreule@outlook.de>

NotMyFault and others added 10 commits April 30, 2024 18:01

1.20.6

567c8f7

Signed-off-by: Alexander Brandes <mc.cache@web.de>

work

ea1b1b0

Signed-off-by: Alexander Brandes <mc.cache@web.de>

More work

8d39b21

Signed-off-by: Alexander Brandes <mc.cache@web.de>

chore: address more removed fields and methods, make it run

c2bd27b

chore: don't allocate unnecessary arrays (by maps)

37ac1a0

chore: the comment might still be noteworthy

7a67969

chore: no need to synchronize twice

a2fca3e

fix obfuscation changes

632aafa

remove unneeded deprecation

9fe763f

make regen work without throwing exceptions - but slow

f28acb7

SirYwell requested a review from a team as a code owner May 11, 2024 18:36

Merge remote-tracking branch 'refs/remotes/origin/main' into 1.20.5

9ed2821

# Conflicts: # buildSrc/build.gradle.kts

fix: error when adapting BaseItemStacks without nbt

2d3c945

github-actions bot added the unresolved-merge-conflict label May 12, 2024

Merge remote-tracking branch 'origin/main' into 1.20.5

8279dbc

# Conflicts: # worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

github-actions bot added unresolved-merge-conflict and removed unresolved-merge-conflict labels May 12, 2024

Merge branch 'main' into 1.20.5

5afcc40

github-actions bot removed the unresolved-merge-conflict label May 13, 2024

fix annoying paper api breakage

897398a

NotMyFault approved these changes May 19, 2024

View reviewed changes

NotMyFault added the Major feature This PR adds a major feature label May 19, 2024

NotMyFault changed the title ~~Initial support for 1.20.5/6~~ Support for 1.20.5/6 May 19, 2024

NotMyFault merged commit a353c12 into main May 19, 2024

NotMyFault deleted the 1.20.5 branch May 19, 2024 11:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Support for 1.20.5/6 #2721

Support for 1.20.5/6 #2721

Uh oh!

SirYwell commented May 11, 2024

Uh oh!

scarfacered commented May 11, 2024

Uh oh!

rwnd-bradley commented May 12, 2024 •

edited

Loading

Uh oh!

SirYwell commented May 12, 2024

Uh oh!

github-actions bot commented May 12, 2024

Uh oh!

github-actions bot commented May 13, 2024

Uh oh!

NotMyFault left a comment

Uh oh!

SirYwell commented May 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Uh oh!

Support for 1.20.5/6 #2721

Support for 1.20.5/6 #2721

Uh oh!

Conversation

SirYwell commented May 11, 2024

Overview

Description

Uh oh!

scarfacered commented May 11, 2024

Uh oh!

rwnd-bradley commented May 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SirYwell commented May 12, 2024

Uh oh!

github-actions bot commented May 12, 2024

Uh oh!

github-actions bot commented May 13, 2024

Uh oh!

NotMyFault left a comment

Choose a reason for hiding this comment

Uh oh!

SirYwell commented May 19, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rwnd-bradley commented May 12, 2024 •

edited

Loading