Skip to content

chore: upstream merges #3184

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.

Sign up for GitHub

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

Merged
NotMyFault merged 6 commits into from
May 10, 2025
Merged

chore: upstream merges #3184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
89aed39
Merge pull request EngineHub/WorldEdit#2740 from ssquadteam/version/7…
octylFractal Mar 29, 2025
34cd165
Update enum-like classes with 1.21.5-rc1 data from MCUtils
me4502 Mar 21, 2025
365ce9b
Do not paste unsaveable entities in their default state (#2721)
brickmonster Apr 13, 2025
ce4d616
Update click and hover text component serialization for 1.21.5. (#2757)
wizjany Apr 18, 2025
54a7622
Add text3 bukkit adapter override for Spigot gson change. (#2759)
wizjany Apr 20, 2025
dfe642b
Make SpigotAdapter compatible with pre 1.21.5 api
SirYwell May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_20_R2/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ private static void readTagIntoEntity(net.minecraft.nbt.CompoundTag tag, Entity
* @param entity the entity
* @param tag the tag
*/
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
entity.save(tag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
return entity.save(tag);
}

private static Block getBlockFromType(BlockType blockType) {
Expand Down Expand Up @@ -482,7 +482,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
String id = getEntityId(mcEntity);

net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, tag);
if (!readEntityIntoTag(mcEntity, tag)) {
return null;
}
return new BaseEntity(
com.sk89q.worldedit.world.entity.EntityTypes.get(id),
LazyReference.from(() -> (LinCompoundTag) toNativeLin(tag))
Expand Down
8 changes: 5 additions & 3 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ private static String getEntityId(Entity entity) {
return resourceLocation == null ? null : resourceLocation.toString();
}

private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
entity.save(compoundTag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
return entity.save(compoundTag);
}

@Override
Expand Down Expand Up @@ -334,7 +334,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
Supplier<LinCompoundTag> saveTag = () -> {
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, minecraftTag);
if (!readEntityIntoTag(mcEntity, minecraftTag)) {
return null;
}
//add Id for AbstractChangeSet to work
final LinCompoundTag tag = (LinCompoundTag) toNativeLin(minecraftTag);
final Map<String, LinTag<?>> tags = NbtUtils.getLinCompoundTagValues(tag);
Expand Down
8 changes: 5 additions & 3 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R3/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ private static void readTagIntoEntity(net.minecraft.nbt.CompoundTag tag, Entity
* @param entity the entity
* @param tag the tag
*/
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
entity.save(tag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
return entity.save(tag);
}

private static Block getBlockFromType(BlockType blockType) {
Expand Down Expand Up @@ -481,7 +481,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
String id = getEntityId(mcEntity);

net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, tag);
if (!readEntityIntoTag(mcEntity, tag)) {
return null;
}
return new BaseEntity(
com.sk89q.worldedit.world.entity.EntityTypes.get(id),
LazyReference.from(() -> (LinCompoundTag) toNativeLin(tag))
Expand Down
8 changes: 5 additions & 3 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ private static String getEntityId(Entity entity) {
return resourceLocation == null ? null : resourceLocation.toString();
}

private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
entity.save(compoundTag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
return entity.save(compoundTag);
}

@Override
Expand Down Expand Up @@ -333,7 +333,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
Supplier<LinCompoundTag> saveTag = () -> {
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, minecraftTag);
if (!readEntityIntoTag(mcEntity, minecraftTag)) {
return null;
}
//add Id for AbstractChangeSet to work
final LinCompoundTag tag = (LinCompoundTag) toNativeLin(minecraftTag);
final Map<String, LinTag<?>> tags = NbtUtils.getLinCompoundTagValues(tag);
Expand Down
8 changes: 5 additions & 3 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext.fawe/v1_20_R4/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,8 @@ private static void readTagIntoEntity(net.minecraft.nbt.CompoundTag tag, Entity
* @param entity the entity
* @param tag the tag
*/
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
entity.save(tag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
return entity.save(tag);
}

private static Block getBlockFromType(BlockType blockType) {
Expand Down Expand Up @@ -489,7 +489,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
String id = getEntityId(mcEntity);

net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, tag);
if (!readEntityIntoTag(mcEntity, tag)) {
return null;
}
return new BaseEntity(
com.sk89q.worldedit.world.entity.EntityTypes.get(id),
LazyReference.from(() -> (LinCompoundTag) toNativeLin(tag))
Expand Down
8 changes: 5 additions & 3 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ private static String getEntityId(Entity entity) {
return resourceLocation == null ? null : resourceLocation.toString();
}

private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
entity.save(compoundTag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
return entity.save(compoundTag);
}

@Override
Expand Down Expand Up @@ -343,7 +343,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
Supplier<LinCompoundTag> saveTag = () -> {
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, minecraftTag);
if (!readEntityIntoTag(mcEntity, minecraftTag)) {
return null;
}
//add Id for AbstractChangeSet to work
final LinCompoundTag tag = (LinCompoundTag) toNativeLin(minecraftTag);
final Map<String, LinTag<?>> tags = NbtUtils.getLinCompoundTagValues(tag);
Expand Down
13 changes: 5 additions & 8 deletions ...rc/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_R1/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,8 @@ private static void readTagIntoEntity(net.minecraft.nbt.CompoundTag tag, Entity
* @param entity the entity
* @param tag the tag
*/
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
entity.save(tag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
return entity.save(tag);
}

private static Block getBlockFromType(BlockType blockType) {
Expand Down Expand Up @@ -476,15 +476,12 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
CraftEntity craftEntity = ((CraftEntity) entity);
Entity mcEntity = craftEntity.getHandle();

// Do not allow creating of passenger entity snapshots, passengers are included in the vehicle entity
if (mcEntity.isPassenger()) {
return null;
}

String id = getEntityId(mcEntity);

net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, tag);
if (!readEntityIntoTag(mcEntity, tag)) {
return null;
}
return new BaseEntity(
EntityTypes.get(id),
LazyReference.from(() -> (LinCompoundTag) toNativeLin(tag))
Expand Down
8 changes: 5 additions & 3 deletions ...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@ private static String getEntityId(Entity entity) {
return resourceLocation == null ? null : resourceLocation.toString();
}

private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
entity.save(compoundTag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
return entity.save(compoundTag);
}

@Override
Expand Down Expand Up @@ -343,7 +343,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
Supplier<LinCompoundTag> saveTag = () -> {
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, minecraftTag);
if (!readEntityIntoTag(mcEntity, minecraftTag)) {
return null;
}
//add Id for AbstractChangeSet to work
final LinCompoundTag tag = (LinCompoundTag) toNativeLin(minecraftTag);
final Map<String, LinTag<?>> tags = NbtUtils.getLinCompoundTagValues(tag);
Expand Down
13 changes: 5 additions & 8 deletions ...src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_4/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,8 @@ private static void readTagIntoEntity(net.minecraft.nbt.CompoundTag tag, Entity
* @param entity the entity
* @param tag the tag
*/
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
entity.save(tag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
return entity.save(tag);
}

private static Block getBlockFromType(BlockType blockType) {
Expand Down Expand Up @@ -465,15 +465,12 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
CraftEntity craftEntity = ((CraftEntity) entity);
Entity mcEntity = craftEntity.getHandle();

// Do not allow creating of passenger entity snapshots, passengers are included in the vehicle entity
if (mcEntity.isPassenger()) {
return null;
}

String id = getEntityId(mcEntity);

net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, tag);
if (!readEntityIntoTag(mcEntity, tag)) {
return null;
}
return new BaseEntity(
EntityTypes.get(id),
LazyReference.from(() -> (LinCompoundTag) toNativeLin(tag))
Expand Down
8 changes: 5 additions & 3 deletions ...ain/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ private static String getEntityId(Entity entity) {
return net.minecraft.world.entity.EntityType.getKey(entity.getType()).toString();
}

private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
entity.save(compoundTag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
return entity.save(compoundTag);
}

@Override
Expand Down Expand Up @@ -327,7 +327,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
Supplier<LinCompoundTag> saveTag = () -> {
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, minecraftTag);
if (!readEntityIntoTag(mcEntity, minecraftTag)) {
return null;
}
//add Id for AbstractChangeSet to work
final LinCompoundTag tag = (LinCompoundTag) toNativeLin(minecraftTag);
final Map<String, LinTag<?>> tags = NbtUtils.getLinCompoundTagValues(tag);
Expand Down
2 changes: 1 addition & 1 deletion worldedit-bukkit/adapters/adapter-1_21_5/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ repositories {

dependencies {
// https://repo.papermc.io/service/rest/repository/browse/maven-public/io/papermc/paper/dev-bundle/
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.5-R0.1-20250412.175117-4")
the<PaperweightUserDependenciesExtension>().paperDevBundle("1.21.5-R0.1-20250509.154041-75")
compileOnly(libs.paperlib)
}
13 changes: 5 additions & 8 deletions ...src/main/java/com/sk89q/worldedit/bukkit/adapter/ext/fawe/v1_21_5/PaperweightAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ private static String getEntityId(Entity entity) {
* @param entity the entity
* @param tag the tag
*/
private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
entity.save(tag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag tag) {
return entity.save(tag);
}

private static Block getBlockFromType(BlockType blockType) {
Expand Down Expand Up @@ -457,15 +457,12 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
CraftEntity craftEntity = ((CraftEntity) entity);
Entity mcEntity = craftEntity.getHandle();

// Do not allow creating of passenger entity snapshots, passengers are included in the vehicle entity
if (mcEntity.isPassenger()) {
return null;
}

String id = getEntityId(mcEntity);

net.minecraft.nbt.CompoundTag tag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, tag);
if (!readEntityIntoTag(mcEntity, tag)) {
return null;
}
return new BaseEntity(
EntityTypes.get(id),
LazyReference.from(() -> (LinCompoundTag) toNativeLin(tag))
Expand Down
8 changes: 5 additions & 3 deletions ...ain/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightFaweAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ private static String getEntityId(Entity entity) {
return net.minecraft.world.entity.EntityType.getKey(entity.getType()).toString();
}

private static void readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
entity.save(compoundTag);
private static boolean readEntityIntoTag(Entity entity, net.minecraft.nbt.CompoundTag compoundTag) {
return entity.save(compoundTag);
}

@Override
Expand Down Expand Up @@ -327,7 +327,9 @@ public BaseEntity getEntity(org.bukkit.entity.Entity entity) {
EntityType type = com.sk89q.worldedit.world.entity.EntityTypes.get(id);
Supplier<LinCompoundTag> saveTag = () -> {
final net.minecraft.nbt.CompoundTag minecraftTag = new net.minecraft.nbt.CompoundTag();
readEntityIntoTag(mcEntity, minecraftTag);
if (!readEntityIntoTag(mcEntity, minecraftTag)) {
return null;
}
//add Id for AbstractChangeSet to work
final LinCompoundTag tag = (LinCompoundTag) toNativeLin(minecraftTag);
final Map<String, LinTag<?>> tags = NbtUtils.getLinCompoundTagValues(tag);
Expand Down
Loading
Loading