From 77eb614338deeb44300f689c3f254bfcdc5befb6 Mon Sep 17 00:00:00 2001 From: Vilperi221 <58680173+Vilsu221@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:47:48 +0300 Subject: [PATCH 01/17] Sponge module refactoring and fixes (#2697) * Refactor some vanilla methods to sponge api * Fixes * Update api 14 * Fixes * PR fixes * Bring back vanilla methods --- gradle/libs.versions.toml | 2 +- .../sk89q/worldedit/sponge/SpongeWorld.java | 17 +- .../worldedit/sponge/SpongeWorldEdit.java | 139 +-------------- .../sponge/SpongeWorldEditListener.java | 167 ++++++++++++++++++ 4 files changed, 191 insertions(+), 134 deletions(-) create mode 100644 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38eb155d52..c3d1d36f0b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ neoforge-minecraft = "1.21.5" sponge-minecraft = "1.21.4" # https://repo.spongepowered.org/service/rest/repository/browse/maven-public/org/spongepowered/spongeapi/ -sponge-api = "14.0.0-20241229.134205-2" +sponge-api = "14.0.0-20250114.224746-4" sponge-api-major = "14" # https://parchmentmc.org/docs/getting-started; note that we use older MC versions some times which is OK diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java index 5f308f7dce..1293cfb8be 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java @@ -19,6 +19,7 @@ package com.sk89q.worldedit.sponge; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEditException; @@ -27,6 +28,7 @@ import com.sk89q.worldedit.entity.Entity; import com.sk89q.worldedit.extent.Extent; import com.sk89q.worldedit.internal.util.LogManagerCompat; +import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.math.Vector3; import com.sk89q.worldedit.regions.CuboidRegion; @@ -53,7 +55,10 @@ import net.minecraft.data.worldgen.features.TreeFeatures; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.RandomSource; +import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.chunk.ChunkAccess; +import net.minecraft.world.level.chunk.status.ChunkStatus; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import org.apache.logging.log4j.Logger; import org.enginehub.linbus.tree.LinCompoundTag; @@ -84,6 +89,7 @@ import java.lang.ref.WeakReference; import java.nio.file.Path; +import java.util.Collection; import java.util.List; import java.util.Optional; import java.util.Set; @@ -201,6 +207,7 @@ public > boolean setBlock(BlockVector3 position, B .withBlocksMoving(false) .withForcedReRender(false) .withIgnoreRender(false) + .withPerformBlockDestruction(false) ); if (!didSet) { // still update NBT if the block is the same @@ -347,7 +354,6 @@ public int getBlockLightLevel(BlockVector3 position) { int groundLight = getWorld().light(LightTypes.BLOCK, position.x(), position.y(), position.z()); return Math.max(skyLight, groundLight); - } @Override @@ -480,6 +486,15 @@ public Entity createEntity(Location location, BaseEntity entity) { return builder.build().apply(SpongeAdapter.adapt(location)).map(SpongeEntity::new).orElse(null); } + @Override + public void sendBiomeUpdates(Iterable chunks) { + List nativeChunks = chunks instanceof Collection chunkCollection ? Lists.newArrayListWithCapacity(chunkCollection.size()) : Lists.newArrayList(); + for (BlockVector2 chunk : chunks) { + nativeChunks.add(((Level) getWorld()).getChunk(chunk.x(), chunk.z(), ChunkStatus.BIOMES, false)); + } + ((ServerLevel) getWorld()).getChunkSource().chunkMap.resendBiomesForChunks(nativeChunks); + } + @Override public WeatherType getWeather() { return WeatherTypes.get( diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java index d7b08818f1..0bb59467eb 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java @@ -28,14 +28,12 @@ import com.sk89q.worldedit.event.platform.PlatformReadyEvent; import com.sk89q.worldedit.event.platform.PlatformUnreadyEvent; import com.sk89q.worldedit.event.platform.PlatformsRegisteredEvent; -import com.sk89q.worldedit.event.platform.SessionIdleEvent; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.extension.platform.Capability; import com.sk89q.worldedit.extension.platform.Platform; import com.sk89q.worldedit.extension.platform.PlatformManager; import com.sk89q.worldedit.internal.anvil.ChunkDeleter; import com.sk89q.worldedit.internal.command.CommandUtil; -import com.sk89q.worldedit.internal.event.InteractionDebouncer; import com.sk89q.worldedit.sponge.config.SpongeConfiguration; import com.sk89q.worldedit.world.biome.BiomeCategory; import com.sk89q.worldedit.world.biome.BiomeType; @@ -47,7 +45,6 @@ import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Server; import org.spongepowered.api.Sponge; -import org.spongepowered.api.block.BlockSnapshot; import org.spongepowered.api.block.BlockType; import org.spongepowered.api.block.entity.BlockEntity; import org.spongepowered.api.block.entity.CommandBlock; @@ -57,26 +54,17 @@ import org.spongepowered.api.command.CommandResult; import org.spongepowered.api.command.parameter.ArgumentReader; import org.spongepowered.api.config.ConfigDir; -import org.spongepowered.api.data.type.HandTypes; import org.spongepowered.api.entity.living.player.server.ServerPlayer; -import org.spongepowered.api.event.EventContextKeys; import org.spongepowered.api.event.Listener; -import org.spongepowered.api.event.action.InteractEvent; -import org.spongepowered.api.event.block.InteractBlockEvent; -import org.spongepowered.api.event.filter.cause.Root; -import org.spongepowered.api.event.item.inventory.InteractItemEvent; import org.spongepowered.api.event.lifecycle.ConstructPluginEvent; import org.spongepowered.api.event.lifecycle.RegisterCommandEvent; import org.spongepowered.api.event.lifecycle.StartedEngineEvent; import org.spongepowered.api.event.lifecycle.StartingEngineEvent; import org.spongepowered.api.event.lifecycle.StoppingEngineEvent; -import org.spongepowered.api.event.network.ServerSideConnectionEvent; import org.spongepowered.api.registry.RegistryTypes; import org.spongepowered.api.scheduler.Task; import org.spongepowered.api.world.LocatableBlock; -import org.spongepowered.api.world.server.ServerLocation; import org.spongepowered.api.world.server.ServerWorld; -import org.spongepowered.math.vector.Vector3d; import org.spongepowered.plugin.PluginContainer; import org.spongepowered.plugin.builtin.jvm.Plugin; @@ -113,7 +101,6 @@ public static SpongeWorldEdit inst() { private final SpongeConfiguration config; private final Path workingDir; - private InteractionDebouncer debouncer; private SpongePermissionsProvider provider; private SpongePlatform platform; @@ -135,7 +122,6 @@ public SpongeWorldEdit(Logger logger, @Listener public void onPluginConstruction(ConstructPluginEvent event) { this.platform = new SpongePlatform(this); - debouncer = new InteractionDebouncer(platform); WorldEdit.getInstance().getPlatformManager().register(platform); @@ -146,6 +132,13 @@ public void onPluginConstruction(ConstructPluginEvent event) { new CUIChannelHandler.RegistrationHandler(), MethodHandles.lookup() ); + + event.game().eventManager().registerListeners( + container, + new SpongeWorldEditListener(this), + MethodHandles.lookup() + ); + logger.info("WorldEdit for Sponge (version " + getInternalVersion() + ") is loaded"); } @@ -310,123 +303,6 @@ public List complete(CommandCause cause, ArgumentReader.Mutab ); } - private boolean skipEvents() { - return platform == null || !platform.isHookingEvents(); - } - - private boolean skipInteractionEvent(InteractEvent event) { - return skipEvents() || event.context().get(EventContextKeys.USED_HAND).orElse(null) != HandTypes.MAIN_HAND.get(); - } - - @Listener - public void onPlayerInteractItemPrimary(InteractItemEvent.Primary event, @Root ServerPlayer spongePlayer) { - if (skipInteractionEvent(event)) { - return; - } - - WorldEdit we = WorldEdit.getInstance(); - SpongePlayer player = SpongeAdapter.adapt(spongePlayer); - - Optional previousResult = debouncer.getDuplicateInteractionResult(player); - if (previousResult.isPresent()) { - return; - } - - boolean result = we.handleArmSwing(player); - debouncer.setLastInteraction(player, result); - } - - @Listener - public void onPlayerInteractItemSecondary(InteractItemEvent.Secondary event, @Root ServerPlayer spongePlayer) { - if (skipInteractionEvent(event)) { - return; - } - - WorldEdit we = WorldEdit.getInstance(); - SpongePlayer player = SpongeAdapter.adapt(spongePlayer); - - Optional previousResult = debouncer.getDuplicateInteractionResult(player); - if (previousResult.isPresent()) { - if (previousResult.get()) { - event.setCancelled(true); - } - return; - } - - boolean result = we.handleRightClick(player); - debouncer.setLastInteraction(player, result); - - if (result) { - event.setCancelled(true); - } - } - - @Listener - public void onPlayerInteractBlockPrimary(InteractBlockEvent.Primary.Start event, @Root ServerPlayer spongePlayer) { - if (skipInteractionEvent(event)) { - return; - } - - WorldEdit we = WorldEdit.getInstance(); - SpongePlayer player = SpongeAdapter.adapt(spongePlayer); - - BlockSnapshot targetBlock = event.block(); - Optional optLoc = targetBlock.location(); - - boolean result = false; - if (optLoc.isPresent()) { - ServerLocation loc = optLoc.get(); - com.sk89q.worldedit.util.Location pos = SpongeAdapter.adapt(loc, Vector3d.ZERO); - - result = we.handleBlockLeftClick(player, pos, SpongeAdapter.adapt(event.targetSide())); - } - - result = we.handleArmSwing(player) || result; - debouncer.setLastInteraction(player, result); - - if (result) { - event.setCancelled(true); - } - } - - @Listener - public void onPlayerInteractBlockSecondary(InteractBlockEvent.Secondary event, @Root ServerPlayer spongePlayer) { - if (skipInteractionEvent(event)) { - return; - } - - WorldEdit we = WorldEdit.getInstance(); - SpongePlayer player = SpongeAdapter.adapt(spongePlayer); - - BlockSnapshot targetBlock = event.block(); - Optional optLoc = targetBlock.location(); - - boolean result = false; - if (optLoc.isPresent()) { - ServerLocation loc = optLoc.get(); - com.sk89q.worldedit.util.Location pos = SpongeAdapter.adapt(loc, Vector3d.ZERO); - - result = we.handleBlockRightClick(player, pos, SpongeAdapter.adapt(event.targetSide())); - } - - result = we.handleRightClick(player) || result; - debouncer.setLastInteraction(player, result); - - if (result) { - event.setCancelled(true); - } - } - - @Listener - public void onPlayerQuit(ServerSideConnectionEvent.Disconnect event) { - event.profile().ifPresent(profile -> { - debouncer.clearInteraction(profile::uniqueId); - - WorldEdit.getInstance().getEventBus() - .post(new SessionIdleEvent(new SpongePlayer.SessionKeyImpl(profile.uniqueId(), profile.name().orElseThrow()))); - }); - } - public PluginContainer getPluginContainer() { return container; } @@ -500,5 +376,4 @@ public void setPermissionsProvider(SpongePermissionsProvider provider) { public SpongePermissionsProvider getPermissionsProvider() { return provider; } - } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java new file mode 100644 index 0000000000..c02cd3b8c5 --- /dev/null +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java @@ -0,0 +1,167 @@ +/* + * WorldEdit, a Minecraft world manipulation toolkit + * Copyright (C) sk89q + * Copyright (C) WorldEdit team and contributors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldedit.sponge; + +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.event.platform.SessionIdleEvent; +import com.sk89q.worldedit.internal.event.InteractionDebouncer; +import org.spongepowered.api.block.BlockSnapshot; +import org.spongepowered.api.data.type.HandTypes; +import org.spongepowered.api.entity.living.player.server.ServerPlayer; +import org.spongepowered.api.event.EventContextKeys; +import org.spongepowered.api.event.Listener; +import org.spongepowered.api.event.action.InteractEvent; +import org.spongepowered.api.event.block.InteractBlockEvent; +import org.spongepowered.api.event.filter.cause.Root; +import org.spongepowered.api.event.item.inventory.InteractItemEvent; +import org.spongepowered.api.event.network.ServerSideConnectionEvent; +import org.spongepowered.api.world.server.ServerLocation; +import org.spongepowered.math.vector.Vector3d; + +import java.util.Optional; + +public class SpongeWorldEditListener { + + private final SpongeWorldEdit plugin; + private final InteractionDebouncer debouncer; + + public SpongeWorldEditListener(SpongeWorldEdit plugin) { + this.plugin = plugin; + debouncer = new InteractionDebouncer(plugin.getPlatform()); + } + + public boolean skipEvents() { + return plugin.getInternalPlatform() == null || !plugin.getInternalPlatform().isHookingEvents(); + } + + private boolean skipInteractionEvent(InteractEvent event) { + return skipEvents() || event.context().get(EventContextKeys.USED_HAND).orElse(null) != HandTypes.MAIN_HAND.get(); + } + + @Listener + public void onPlayerInteractItemPrimary(InteractItemEvent.Primary event, @Root ServerPlayer spongePlayer) { + if (skipInteractionEvent(event)) { + return; + } + + WorldEdit we = WorldEdit.getInstance(); + SpongePlayer player = SpongeAdapter.adapt(spongePlayer); + + Optional previousResult = debouncer.getDuplicateInteractionResult(player); + if (previousResult.isPresent()) { + return; + } + + boolean result = we.handleArmSwing(player); + debouncer.setLastInteraction(player, result); + } + + @Listener + public void onPlayerInteractItemSecondary(InteractItemEvent.Secondary event, @Root ServerPlayer spongePlayer) { + if (skipInteractionEvent(event)) { + return; + } + + WorldEdit we = WorldEdit.getInstance(); + SpongePlayer player = SpongeAdapter.adapt(spongePlayer); + + Optional previousResult = debouncer.getDuplicateInteractionResult(player); + if (previousResult.isPresent()) { + if (previousResult.get()) { + event.setCancelled(true); + } + return; + } + + boolean result = we.handleRightClick(player); + debouncer.setLastInteraction(player, result); + + if (result) { + event.setCancelled(true); + } + } + + @Listener + public void onPlayerInteractBlockPrimary(InteractBlockEvent.Primary.Start event, @Root ServerPlayer spongePlayer) { + if (skipInteractionEvent(event)) { + return; + } + + WorldEdit we = WorldEdit.getInstance(); + SpongePlayer player = SpongeAdapter.adapt(spongePlayer); + + BlockSnapshot targetBlock = event.block(); + Optional optLoc = targetBlock.location(); + + boolean result = false; + if (optLoc.isPresent()) { + ServerLocation loc = optLoc.get(); + com.sk89q.worldedit.util.Location pos = SpongeAdapter.adapt(loc, Vector3d.ZERO); + + result = we.handleBlockLeftClick(player, pos, SpongeAdapter.adapt(event.targetSide())); + } + + result = we.handleArmSwing(player) || result; + debouncer.setLastInteraction(player, result); + + if (result) { + event.setCancelled(true); + } + } + + @Listener + public void onPlayerInteractBlockSecondary(InteractBlockEvent.Secondary.Pre event, @Root ServerPlayer spongePlayer) { + if (skipInteractionEvent(event)) { + return; + } + + WorldEdit we = WorldEdit.getInstance(); + SpongePlayer player = SpongeAdapter.adapt(spongePlayer); + + BlockSnapshot targetBlock = event.block(); + Optional optLoc = targetBlock.location(); + + boolean result = false; + if (optLoc.isPresent()) { + ServerLocation loc = optLoc.get(); + com.sk89q.worldedit.util.Location pos = SpongeAdapter.adapt(loc, Vector3d.ZERO); + + result = we.handleBlockRightClick(player, pos, SpongeAdapter.adapt(event.targetSide())); + } + + result = we.handleRightClick(player) || result; + debouncer.setLastInteraction(player, result); + + if (result) { + event.setCancelled(true); + } + } + + @Listener + public void onPlayerQuit(ServerSideConnectionEvent.Disconnect event) { + event.profile().ifPresent(profile -> { + debouncer.clearInteraction(profile::uniqueId); + + WorldEdit.getInstance().getEventBus() + .post(new SessionIdleEvent(new SpongePlayer.SessionKeyImpl(profile.uniqueId(), profile.name().orElseThrow()))); + }); + } + +} From 4ac910335464ff7874f2ebba792fc1e0c0c07955 Mon Sep 17 00:00:00 2001 From: Maddy Miller Date: Thu, 10 Apr 2025 23:34:01 +1000 Subject: [PATCH 02/17] [Bukkit] Workaround string NBT data being wrapped with quotes in MC 1.21.5 (#2753) --- .../bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java index 34503b8246..a63eb97008 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java @@ -1047,7 +1047,7 @@ LinTag toNative(net.minecraft.nbt.Tag foreign) { } else if (foreign instanceof net.minecraft.nbt.ShortTag shortTag) { return LinShortTag.of(shortTag.shortValue()); } else if (foreign instanceof net.minecraft.nbt.StringTag stringTag) { - return LinStringTag.of(stringTag.toString()); + return LinStringTag.of(stringTag.value()); } else if (foreign instanceof net.minecraft.nbt.EndTag) { return LinEndTag.instance(); } else { From 25988878dcb5ac639ae0220e570828cde67816ee Mon Sep 17 00:00:00 2001 From: brickmonster <92665597+brickmonster@users.noreply.github.com> Date: Sun, 13 Apr 2025 09:47:48 +0100 Subject: [PATCH 03/17] 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. --- .../adapter/impl/v1_21_3/PaperweightAdapter.java | 13 +++++-------- .../adapter/impl/v1_21_4/PaperweightAdapter.java | 13 +++++-------- .../adapter/impl/v1_21_5/PaperweightAdapter.java | 13 +++++-------- .../worldedit/fabric/internal/FabricEntity.java | 8 +++++--- .../worldedit/neoforge/internal/NeoForgeEntity.java | 13 +++++++++---- .../com/sk89q/worldedit/sponge/SpongeEntity.java | 6 +++++- 6 files changed, 34 insertions(+), 32 deletions(-) diff --git a/worldedit-bukkit/adapters/adapter-1.21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightAdapter.java index 0edeae839e..099adfcab3 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.3/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_3/PaperweightAdapter.java @@ -290,8 +290,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) { @@ -471,15 +471,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) toNative(tag)) diff --git a/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java index ddd0684942..7ea004366d 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_4/PaperweightAdapter.java @@ -290,8 +290,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) { @@ -471,15 +471,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) toNative(tag)) diff --git a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java index a63eb97008..db1080edbb 100644 --- a/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java +++ b/worldedit-bukkit/adapters/adapter-1.21.5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/v1_21_5/PaperweightAdapter.java @@ -290,8 +290,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) { @@ -471,15 +471,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) toNative(tag)) diff --git a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/internal/FabricEntity.java b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/internal/FabricEntity.java index 12db9ce716..8d11a6aa95 100644 --- a/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/internal/FabricEntity.java +++ b/worldedit-fabric/src/main/java/com/sk89q/worldedit/fabric/internal/FabricEntity.java @@ -52,12 +52,14 @@ public FabricEntity(net.minecraft.world.entity.Entity entity) { @Override public BaseEntity getState() { net.minecraft.world.entity.Entity entity = entityRef.get(); - if (entity == null || entity.isPassenger()) { + if (entity == null) { return null; } - ResourceLocation id = FabricWorldEdit.getRegistry(Registries.ENTITY_TYPE).getKey(entity.getType()); CompoundTag tag = new CompoundTag(); - entity.saveWithoutId(tag); + if (!entity.save(tag)) { + return null; + } + ResourceLocation id = FabricWorldEdit.getRegistry(Registries.ENTITY_TYPE).getKey(entity.getType()); return new BaseEntity( EntityTypes.get(id.toString()), LazyReference.from(() -> NBTConverter.fromNative(tag)) diff --git a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeEntity.java b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeEntity.java index 837f6cff6b..9087921dc8 100644 --- a/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeEntity.java +++ b/worldedit-neoforge/src/main/java/com/sk89q/worldedit/neoforge/internal/NeoForgeEntity.java @@ -52,13 +52,18 @@ public NeoForgeEntity(net.minecraft.world.entity.Entity entity) { @Override public BaseEntity getState() { net.minecraft.world.entity.Entity entity = entityRef.get(); - if (entity == null || entity.isPassenger()) { + if (entity == null) { return null; } - ResourceLocation id = BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()); CompoundTag tag = new CompoundTag(); - entity.saveWithoutId(tag); - return new BaseEntity(EntityTypes.get(id.toString()), LazyReference.from(() -> NBTConverter.fromNative(tag))); + if (!entity.save(tag)) { + return null; + } + ResourceLocation id = BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType()); + return new BaseEntity( + EntityTypes.get(id.toString()), + LazyReference.from(() -> NBTConverter.fromNative(tag)) + ); } @Override diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java index e8ad6b39d1..40f0d6ee02 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeEntity.java @@ -53,7 +53,11 @@ public BaseEntity getState() { if (entity == null || entity.vehicle().isPresent()) { return null; } - EntityType entityType = EntityType.REGISTRY.get(entity.type().key(RegistryTypes.ENTITY_TYPE).asString()); + org.spongepowered.api.entity.EntityType spongeEntityType = entity.type(); + if (spongeEntityType.isTransient()) { + return null; + } + EntityType entityType = EntityType.REGISTRY.get(spongeEntityType.key(RegistryTypes.ENTITY_TYPE).asString()); if (entityType == null) { return null; } From ce043859e87d6ec7b3571cc14505b4c12a46a372 Mon Sep 17 00:00:00 2001 From: wizjany Date: Thu, 17 Apr 2025 22:03:30 -0400 Subject: [PATCH 04/17] 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. --- .../main/kotlin/buildlogic.common.gradle.kts | 1 + .../text/serializer/gson/StyleSerializer.java | 207 ++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java diff --git a/build-logic/src/main/kotlin/buildlogic.common.gradle.kts b/build-logic/src/main/kotlin/buildlogic.common.gradle.kts index aa94bbe814..bc5bea09bf 100644 --- a/build-logic/src/main/kotlin/buildlogic.common.gradle.kts +++ b/build-logic/src/main/kotlin/buildlogic.common.gradle.kts @@ -49,6 +49,7 @@ license { header(rootProject.file("HEADER.txt")) include("**/*.java") include("**/*.kt") + exclude("**/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java") } plugins.withId("idea") { diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java new file mode 100644 index 0000000000..5209ced100 --- /dev/null +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/text/serializer/gson/StyleSerializer.java @@ -0,0 +1,207 @@ +/* + * This file is part of text, licensed under the MIT License. + * + * Copyright (c) 2017-2020 KyoriPowered + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package com.sk89q.worldedit.util.formatting.text.serializer.gson; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSerializationContext; +import com.google.gson.JsonSerializer; +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.extension.platform.Capability; +import com.sk89q.worldedit.internal.Constants; +import com.sk89q.worldedit.util.formatting.text.Component; +import com.sk89q.worldedit.util.formatting.text.event.ClickEvent; +import com.sk89q.worldedit.util.formatting.text.event.HoverEvent; +import com.sk89q.worldedit.util.formatting.text.format.Style; +import com.sk89q.worldedit.util.formatting.text.format.TextColor; +import com.sk89q.worldedit.util.formatting.text.format.TextDecoration; + +import java.lang.reflect.Type; + +// This class was copied and manually "relocated" from text3 to update the click/hover events for 1.21.5. +public class StyleSerializer implements JsonDeserializer