From 30b4999a1361f3b7de59fc683abc9e46c98ea58d Mon Sep 17 00:00:00 2001 From: Vilsu221 <58680173+Vilsu221@users.noreply.github.com> Date: Sun, 5 Jan 2025 23:58:57 +0200 Subject: [PATCH 1/6] Refactor some vanilla methods to sponge api --- .../sk89q/worldedit/sponge/SpongeAdapter.java | 9 +- .../worldedit/sponge/SpongeBlockMaterial.java | 30 ++-- .../worldedit/sponge/SpongeBlockRegistry.java | 23 ++- .../sk89q/worldedit/sponge/SpongePlayer.java | 2 +- .../sk89q/worldedit/sponge/SpongeWorld.java | 25 ++- .../worldedit/sponge/SpongeWorldEdit.java | 140 ++--------------- .../sponge/SpongeWorldEditListener.java | 145 ++++++++++++++++++ .../sponge/internal/ExtendedChunk.java | 43 ------ .../sponge/internal/SpongeTransmogrifier.java | 112 ++++++-------- .../internal/SpongeWorldNativeAccess.java | 9 +- 10 files changed, 253 insertions(+), 285 deletions(-) create mode 100644 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java delete mode 100644 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java index 401456b4ae..c95cff5328 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java @@ -32,7 +32,6 @@ import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.item.ItemTypes; -import net.minecraft.world.level.block.Block; import org.enginehub.linbus.tree.LinCompoundTag; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; @@ -59,16 +58,16 @@ */ public class SpongeAdapter { - public static org.spongepowered.api.block.BlockState adapt(BlockState blockState) { + public static org.spongepowered.api.block.BlockState adapt(BlockState blockState, ServerWorld world) { int blockStateId = BlockStateIdAccess.getBlockStateId(blockState); if (!BlockStateIdAccess.isValidInternalId(blockStateId)) { return SpongeTransmogrifier.transmogToMinecraft(blockState); } - return (org.spongepowered.api.block.BlockState) Block.stateById(blockStateId); + return world.blockPalette().get(blockStateId, world).orElseThrow(); } - public static BlockState adapt(org.spongepowered.api.block.BlockState blockState) { - int blockStateId = Block.getId((net.minecraft.world.level.block.state.BlockState) blockState); + public static BlockState adapt(org.spongepowered.api.block.BlockState blockState, ServerWorld world) { + int blockStateId = world.blockPalette().get(blockState).orElseThrow(); BlockState worldEdit = BlockStateIdAccess.getBlockStateById(blockStateId); if (worldEdit == null) { return SpongeTransmogrifier.transmogToWorldEdit(blockState); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java index 861b9d633b..4b0d1d992f 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java @@ -21,8 +21,11 @@ import com.sk89q.worldedit.world.registry.BlockMaterial; import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.PushReaction; +import org.spongepowered.api.block.BlockState; +import org.spongepowered.api.data.Keys; +import org.spongepowered.api.data.type.MatterTypes; +import org.spongepowered.api.data.type.PushReactions; +import org.spongepowered.api.tag.BlockTypeTags; import javax.annotation.Nullable; @@ -42,55 +45,52 @@ public SpongeBlockMaterial(BlockState block, @Nullable BlockMaterial secondary) @Override public boolean isAir() { - return block.isAir() || super.isAir(); + return block.type().is(BlockTypeTags.AIR) || super.isAir(); } @Override public boolean isOpaque() { - return block.canOcclude(); + return ((net.minecraft.world.level.block.state.BlockState) block).canOcclude(); } @Override - @SuppressWarnings("deprecation") public boolean isLiquid() { - return block.liquid(); + return block.require(Keys.MATTER_TYPE) == MatterTypes.LIQUID.get(); } @Override - @SuppressWarnings("deprecation") public boolean isSolid() { - return block.isSolid(); + return block.require(Keys.IS_SOLID); } @Override public boolean isFragileWhenPushed() { - return block.getPistonPushReaction() == PushReaction.DESTROY; + return block.require(Keys.PUSH_REACTION) == PushReactions.DESTROY.get(); } @Override public boolean isUnpushable() { - return block.getPistonPushReaction() == PushReaction.BLOCK; + return block.require(Keys.PUSH_REACTION) == PushReactions.BLOCK.get(); } @Override - @SuppressWarnings("deprecation") public boolean isMovementBlocker() { - return block.blocksMotion(); + return !block.require(Keys.IS_PASSABLE); } @Override public boolean isBurnable() { - return block.ignitedByLava(); + return block.require(Keys.BURNABLE); } @Override public boolean isToolRequired() { - return block.requiresCorrectToolForDrops(); + return ((net.minecraft.world.level.block.state.BlockState) block).requiresCorrectToolForDrops(); } @Override public boolean isReplacedDuringPlacement() { - return block.canBeReplaced(); + return block.require(Keys.IS_REPLACEABLE); } } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java index f692e9c278..12becb9a02 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java @@ -26,11 +26,12 @@ import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.registry.BlockMaterial; import com.sk89q.worldedit.world.registry.BundledBlockRegistry; -import net.minecraft.world.level.block.Block; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; import org.spongepowered.api.registry.RegistryTypes; import org.spongepowered.api.state.StateProperty; +import org.spongepowered.api.world.DefaultWorldKeys; +import org.spongepowered.api.world.server.ServerWorld; import java.util.Collection; import java.util.HashMap; @@ -56,14 +57,10 @@ public BlockMaterial getMaterial(BlockType blockType) { .value(ResourceKey.resolve(blockType.id())); return materialMap.computeIfAbsent( spongeBlockType.defaultState(), - m -> { - net.minecraft.world.level.block.state.BlockState blockState = - (net.minecraft.world.level.block.state.BlockState) m; - return new SpongeBlockMaterial( - blockState, - super.getMaterial(blockType) - ); - } + blockState -> new SpongeBlockMaterial( + blockState, + super.getMaterial(blockType) + ) ); } @@ -83,9 +80,9 @@ public BlockMaterial getMaterial(BlockType blockType) { @Override public OptionalInt getInternalBlockStateId(BlockState state) { - org.spongepowered.api.block.BlockState equivalent = SpongeAdapter.adapt(state); - return OptionalInt.of(Block.getId( - (net.minecraft.world.level.block.state.BlockState) equivalent - )); + ServerWorld world = Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).orElseThrow(); + org.spongepowered.api.block.BlockState equivalent = SpongeAdapter.adapt(state, world); + + return world.blockPalette().get(equivalent); } } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java index 1b78106df9..02274c472c 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java @@ -234,7 +234,7 @@ public > void sendFakeBlock(BlockVector3 pos, B bl if (block == null) { player.resetBlockChange(pos.x(), pos.y(), pos.z()); } else { - BlockState spongeBlock = SpongeAdapter.adapt(block.toImmutableState()); + BlockState spongeBlock = SpongeAdapter.adapt(block.toImmutableState(), player.world()); player.sendBlockChange(pos.x(), pos.y(), pos.z(), spongeBlock); if (block instanceof final BaseBlock baseBlock && block.getBlockType().equals(com.sk89q.worldedit.world.block.BlockTypes.STRUCTURE_BLOCK)) { 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 698c7242d9..7d691daa8b 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,9 +89,7 @@ import java.lang.ref.WeakReference; import java.nio.file.Path; -import java.util.List; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; @@ -152,7 +155,7 @@ public Path getStoragePath() { public BlockState getBlock(BlockVector3 position) { return SpongeAdapter.adapt(getWorld().block( position.x(), position.y(), position.z() - )); + ), getWorld()); } @Override @@ -185,7 +188,7 @@ public > boolean setBlock(BlockVector3 position, B ServerWorld world = getWorld(); - org.spongepowered.api.block.BlockState newState = SpongeAdapter.adapt(block.toImmutableState()); + org.spongepowered.api.block.BlockState newState = SpongeAdapter.adapt(block.toImmutableState(), world); boolean didSet = world.setBlock( position.x(), position.y(), position.z(), @@ -345,7 +348,6 @@ public int getBlockLightLevel(BlockVector3 position) { int groundLight = getWorld().light(LightTypes.BLOCK, position.x(), position.y(), position.z()); return Math.max(skyLight, groundLight); - } @Override @@ -402,7 +404,7 @@ public void simulateBlockMine(BlockVector3 position) { @Override public boolean canPlaceAt(BlockVector3 position, com.sk89q.worldedit.world.block.BlockState blockState) { - return ((net.minecraft.world.level.block.state.BlockState) SpongeAdapter.adapt(blockState)) + return ((net.minecraft.world.level.block.state.BlockState) SpongeAdapter.adapt(blockState, getWorld())) .canSurvive( ((LevelReader) getWorld()), new BlockPos(position.x(), position.y(), position.z()) @@ -478,6 +480,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 9134274ee6..7359ee9d07 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,7 +28,6 @@ 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; @@ -47,7 +46,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 +55,18 @@ 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.DefaultWorldKeys; 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; @@ -144,6 +134,12 @@ public void onPluginConstruction(ConstructPluginEvent event) { container, new CUIChannelHandler.RegistrationHandler() ); + + event.game().eventManager().registerListeners( + container, + new SpongeWorldEditListener(this) + ); + logger.info("WorldEdit for Sponge (version " + getInternalVersion() + ") is loaded"); } @@ -172,7 +168,7 @@ public void serverStarted(StartedEngineEvent event) { BlockType spongeBlockType = Sponge.game().registry(RegistryTypes.BLOCK_TYPE).value( ResourceKey.resolve(input.getBlockType().id()) ); - return SpongeAdapter.adapt(spongeBlockType.defaultState()); + return SpongeAdapter.adapt(spongeBlockType.defaultState(), Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).orElseThrow()); } )); } @@ -308,123 +304,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; } @@ -499,4 +378,7 @@ public SpongePermissionsProvider getPermissionsProvider() { return provider; } + public InteractionDebouncer getDebouncer() { + return debouncer; + } } 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..e8f435090e --- /dev/null +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java @@ -0,0 +1,145 @@ +package com.sk89q.worldedit.sponge; + +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.event.platform.SessionIdleEvent; +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; + + public SpongeWorldEditListener(SpongeWorldEdit plugin) { + this.plugin = plugin; + } + + 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 = plugin.getDebouncer().getDuplicateInteractionResult(player); + if (previousResult.isPresent()) { + return; + } + + boolean result = we.handleArmSwing(player); + plugin.getDebouncer().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 = plugin.getDebouncer().getDuplicateInteractionResult(player); + if (previousResult.isPresent()) { + if (previousResult.get()) { + event.setCancelled(true); + } + return; + } + + boolean result = we.handleRightClick(player); + plugin.getDebouncer().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; + plugin.getDebouncer().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; + plugin.getDebouncer().setLastInteraction(player, result); + + if (result) { + event.setCancelled(true); + } + } + + @Listener + public void onPlayerQuit(ServerSideConnectionEvent.Disconnect event) { + event.profile().ifPresent(profile -> { + plugin.getDebouncer().clearInteraction(profile::uniqueId); + + WorldEdit.getInstance().getEventBus() + .post(new SessionIdleEvent(new SpongePlayer.SessionKeyImpl(profile.uniqueId(), profile.name().orElseThrow()))); + }); + } + +} diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java deleted file mode 100644 index 47e0451e27..0000000000 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * 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.internal; - -import com.sk89q.worldedit.util.SideEffect; -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.chunk.LevelChunk; - -import javax.annotation.Nullable; - -public interface ExtendedChunk { - /** - * {@link LevelChunk#setBlockState(BlockPos, BlockState, boolean)} with the extra - * {@link SideEffect#UPDATE} flag. - * - * @param pos the position to set - * @param state the state to set - * @param moved I honestly have no idea and can't be bothered to investigate, we pass {@code - * false} - * @param update the update flag, see side-effect for details - * @return the old block state, or {@code null} if unchanged - */ - @Nullable - BlockState setBlockState(BlockPos pos, BlockState state, boolean moved, boolean update); -} diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java index 0bedfe64ab..b772d70ac7 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java @@ -31,10 +31,12 @@ import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockType; -import net.minecraft.util.StringRepresentable; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; +import org.spongepowered.api.data.type.StringRepresentable; import org.spongepowered.api.registry.RegistryTypes; +import org.spongepowered.api.state.BooleanStateProperty; +import org.spongepowered.api.state.EnumStateProperty; import org.spongepowered.api.state.StateProperty; import java.util.Comparator; @@ -50,31 +52,21 @@ public class SpongeTransmogrifier { private static final LoadingCache, Property> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() { @Override public Property load(StateProperty property) { - net.minecraft.world.level.block.state.properties.Property nativeProperty = - (net.minecraft.world.level.block.state.properties.Property) property; - String propertyName = nativeProperty.getName(); - if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { - return new BooleanProperty(propertyName, - ImmutableList.copyOf(((net.minecraft.world.level.block.state.properties.BooleanProperty) nativeProperty).getPossibleValues())); - } - if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { - return new IntegerProperty(propertyName, - ImmutableList.copyOf(((net.minecraft.world.level.block.state.properties.IntegerProperty) nativeProperty).getPossibleValues())); - } - if (isDirectionProperty(nativeProperty)) { - return new DirectionalProperty(propertyName, - ((net.minecraft.world.level.block.state.properties.EnumProperty) nativeProperty).getPossibleValues().stream() - .map(x -> adaptDirection((net.minecraft.core.Direction) x)) - .toList() - ); - } - if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { - return new EnumProperty(propertyName, - ((net.minecraft.world.level.block.state.properties.EnumProperty) nativeProperty).getPossibleValues().stream() - .map(StringRepresentable::getSerializedName) - .toList()); - } - throw new IllegalStateException("Unknown property type"); + return switch (property) { + case BooleanStateProperty stateProperty -> + new BooleanProperty(property.name(), ImmutableList.copyOf(stateProperty.possibleValues())); + case IntegerProperty stateProperty -> new IntegerProperty(property.name(), stateProperty.getValues()); + case EnumStateProperty stateProperty when stateProperty.valueClass() == org.spongepowered.api.util.Direction.class -> + new DirectionalProperty(property.name(), stateProperty.possibleValues().stream() + .map(x -> adaptDirection((org.spongepowered.api.util.Direction) x)) + .toList()); + case EnumStateProperty stateProperty -> + new EnumProperty(property.name(), stateProperty.possibleValues().stream() + .map(org.spongepowered.api.data.type.StringRepresentable::serializationString) + .toList()); + default -> throw new IllegalStateException("Unknown property type"); + }; + } }); @@ -84,28 +76,23 @@ public static Property transmogToWorldEditProperty(StateProperty property) private static Map, Object> transmogToWorldEditProperties( BlockType block, - net.minecraft.world.level.block.state.BlockState blockState + org.spongepowered.api.block.BlockState blockState ) { Map, Object> properties = new TreeMap<>(Comparator.comparing(Property::getName)); - for (net.minecraft.world.level.block.state.properties.Property nativeProperty: blockState.getProperties()) { - Object value = blockState.getValue(nativeProperty); - if (isDirectionProperty(nativeProperty)) { - net.minecraft.core.Direction nativeDirectionValue = (net.minecraft.core.Direction) value; + for (StateProperty stateProperty: blockState.stateProperties()) { + Object value = blockState.stateProperty(stateProperty).orElseThrow(); + if (stateProperty.valueClass() == org.spongepowered.api.util.Direction.class) { + org.spongepowered.api.util.Direction nativeDirectionValue = (org.spongepowered.api.util.Direction) value; value = adaptDirection(nativeDirectionValue); - } else if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { - value = ((StringRepresentable) value).getSerializedName(); + } else if (stateProperty instanceof EnumStateProperty) { + value = ((StringRepresentable) value).serializationString(); } - properties.put(block.getProperty(nativeProperty.getName()), value); + properties.put(block.getProperty(stateProperty.name()), value); } return properties; } - private static boolean isDirectionProperty(net.minecraft.world.level.block.state.properties.Property property) { - return property instanceof net.minecraft.world.level.block.state.properties.EnumProperty - && property.getValueClass().isAssignableFrom(net.minecraft.core.Direction.class); - } - - private static Direction adaptDirection(net.minecraft.core.Direction direction) { + private static Direction adaptDirection(org.spongepowered.api.util.Direction direction) { switch (direction) { case UP: return Direction.UP; @@ -124,36 +111,33 @@ private static Direction adaptDirection(net.minecraft.core.Direction direction) } } - private static net.minecraft.core.Direction adaptDirection(Direction direction) { + private static org.spongepowered.api.util.Direction adaptDirection(Direction direction) { switch (direction) { case UP: - return net.minecraft.core.Direction.UP; + return org.spongepowered.api.util.Direction.UP; case DOWN: - return net.minecraft.core.Direction.DOWN; + return org.spongepowered.api.util.Direction.DOWN; case EAST: - return net.minecraft.core.Direction.EAST; + return org.spongepowered.api.util.Direction.EAST; case WEST: - return net.minecraft.core.Direction.WEST; + return org.spongepowered.api.util.Direction.WEST; case NORTH: - return net.minecraft.core.Direction.NORTH; + return org.spongepowered.api.util.Direction.NORTH; case SOUTH: - return net.minecraft.core.Direction.SOUTH; + return org.spongepowered.api.util.Direction.SOUTH; default: throw new AssertionError("New direction added: " + direction); } } - private static net.minecraft.world.level.block.state.properties.Property findPropertyByName( - net.minecraft.world.level.block.state.BlockState blockState, - String propertyName - ) { - for (net.minecraft.world.level.block.state.properties.Property property: blockState.getProperties()) { - if (property.getName().equals(propertyName)) { + private static StateProperty findPropertyByName(org.spongepowered.api.block.BlockState blockState, String propertyName) { + for (StateProperty property: blockState.stateProperties()) { + if (property.name().equals(propertyName)) { return property; } } - throw new IllegalStateException("Missing property in " + blockState.getBlock() + ": " + propertyName); + throw new IllegalStateException("Missing property in " + blockState.asString() + ": " + propertyName); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -161,20 +145,19 @@ private static org.spongepowered.api.block.BlockState transmogToMinecraftPropert org.spongepowered.api.block.BlockState blockState, Map, Object> states ) { - net.minecraft.world.level.block.state.BlockState nativeBlockState = - (net.minecraft.world.level.block.state.BlockState) blockState; + org.spongepowered.api.block.BlockState nativeBlockState = blockState; + for (Map.Entry, Object> stateEntry: states.entrySet()) { Property property = stateEntry.getKey(); Object value = stateEntry.getValue(); - net.minecraft.world.level.block.state.properties.Property nativeProperty = - findPropertyByName(nativeBlockState, property.getName()); - Comparable nativeValue; + StateProperty nativeProperty = findPropertyByName(blockState, property.getName()); + Comparable nativeValue; if (property instanceof DirectionalProperty) { Direction directionValue = (Direction) value; nativeValue = adaptDirection(directionValue); } else if (property instanceof EnumProperty) { String valueName = (String) value; - Optional> nativeValueOpt = nativeProperty.getValue(valueName); + Optional> nativeValueOpt = nativeProperty.parseValue(valueName); if (nativeValueOpt.isEmpty()) { throw new IllegalStateException("Failed to parse " + valueName + " into " + property.getName()); } @@ -182,11 +165,11 @@ private static org.spongepowered.api.block.BlockState transmogToMinecraftPropert } else { nativeValue = (Comparable) value; } - nativeBlockState = nativeBlockState.setValue( - (net.minecraft.world.level.block.state.properties.Property) nativeProperty, (Comparable) nativeValue); + + nativeBlockState = (org.spongepowered.api.block.BlockState) nativeBlockState.withStateProperty(nativeProperty, nativeValue).orElseThrow(); } - return (org.spongepowered.api.block.BlockState) nativeBlockState; + return nativeBlockState; } public static org.spongepowered.api.block.BlockState transmogToMinecraft(BlockState blockState) { @@ -201,8 +184,7 @@ public static BlockState transmogToWorldEdit(org.spongepowered.api.block.BlockSt BlockType blockType = BlockType.REGISTRY.get( blockState.type().key(RegistryTypes.BLOCK_TYPE).asString() ); - return blockType.getState(transmogToWorldEditProperties(blockType, - (net.minecraft.world.level.block.state.BlockState) blockState)); + return blockType.getState(transmogToWorldEditProperties(blockType, blockState)); } private SpongeTransmogrifier() { diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java index f831404759..85211e480a 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java @@ -21,7 +21,6 @@ import com.sk89q.worldedit.internal.wna.WorldNativeAccess; import com.sk89q.worldedit.sponge.SpongeAdapter; -import com.sk89q.worldedit.util.SideEffect; import com.sk89q.worldedit.util.SideEffectSet; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -32,6 +31,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.LevelChunk; import org.enginehub.linbus.tree.LinCompoundTag; +import org.spongepowered.api.world.server.ServerWorld; import java.lang.ref.WeakReference; import java.util.Objects; @@ -64,7 +64,7 @@ public LevelChunk getChunk(int x, int z) { @Override public BlockState toNative(com.sk89q.worldedit.world.block.BlockState state) { - return (BlockState) SpongeAdapter.adapt(state); + return (BlockState) SpongeAdapter.adapt(state, (ServerWorld) world); } @Override @@ -75,11 +75,6 @@ public BlockState getBlockState(LevelChunk chunk, BlockPos position) { @Nullable @Override public BlockState setBlockState(LevelChunk chunk, BlockPos position, BlockState state) { - if (chunk instanceof ExtendedChunk) { - return ((ExtendedChunk) chunk).setBlockState( - position, state, false, sideEffectSet.shouldApply(SideEffect.UPDATE) - ); - } return chunk.setBlockState(position, state, false); } From f80a5efa2f4928a5be71dabbd64638ec9defd375 Mon Sep 17 00:00:00 2001 From: Vilsu221 <58680173+Vilsu221@users.noreply.github.com> Date: Wed, 8 Jan 2025 22:51:12 +0200 Subject: [PATCH 2/6] Fixes --- .../sk89q/worldedit/sponge/SpongeWorld.java | 5 ++++- .../sponge/SpongeWorldEditListener.java | 19 +++++++++++++++++++ .../sponge/internal/SpongeTransmogrifier.java | 10 ++++++---- .../internal/SpongeWorldNativeAccess.java | 2 +- 4 files changed, 30 insertions(+), 6 deletions(-) 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 7d691daa8b..3f61d27b62 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 @@ -89,7 +89,10 @@ import java.lang.ref.WeakReference; import java.nio.file.Path; -import java.util.*; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; 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 index e8f435090e..890cdfeb56 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java @@ -1,3 +1,22 @@ +/* + * 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; diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java index b772d70ac7..ddff3ada64 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java @@ -37,6 +37,7 @@ import org.spongepowered.api.registry.RegistryTypes; import org.spongepowered.api.state.BooleanStateProperty; import org.spongepowered.api.state.EnumStateProperty; +import org.spongepowered.api.state.IntegerStateProperty; import org.spongepowered.api.state.StateProperty; import java.util.Comparator; @@ -55,14 +56,14 @@ public Property load(StateProperty property) { return switch (property) { case BooleanStateProperty stateProperty -> new BooleanProperty(property.name(), ImmutableList.copyOf(stateProperty.possibleValues())); - case IntegerProperty stateProperty -> new IntegerProperty(property.name(), stateProperty.getValues()); + case IntegerStateProperty stateProperty -> new IntegerProperty(property.name(), ImmutableList.copyOf(stateProperty.possibleValues())); case EnumStateProperty stateProperty when stateProperty.valueClass() == org.spongepowered.api.util.Direction.class -> new DirectionalProperty(property.name(), stateProperty.possibleValues().stream() .map(x -> adaptDirection((org.spongepowered.api.util.Direction) x)) .toList()); case EnumStateProperty stateProperty -> - new EnumProperty(property.name(), stateProperty.possibleValues().stream() - .map(org.spongepowered.api.data.type.StringRepresentable::serializationString) + new EnumProperty(property.name(), ((net.minecraft.world.level.block.state.properties.EnumProperty) (Object) stateProperty).getPossibleValues().stream() + .map(net.minecraft.util.StringRepresentable::getSerializedName) .toList()); default -> throw new IllegalStateException("Unknown property type"); }; @@ -80,7 +81,8 @@ private static Map, Object> transmogToWorldEditProperties( ) { Map, Object> properties = new TreeMap<>(Comparator.comparing(Property::getName)); for (StateProperty stateProperty: blockState.stateProperties()) { - Object value = blockState.stateProperty(stateProperty).orElseThrow(); + Object value = ((net.minecraft.world.level.block.state.BlockState) blockState) + .getValue((net.minecraft.world.level.block.state.properties.Property) stateProperty); if (stateProperty.valueClass() == org.spongepowered.api.util.Direction.class) { org.spongepowered.api.util.Direction nativeDirectionValue = (org.spongepowered.api.util.Direction) value; value = adaptDirection(nativeDirectionValue); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java index 85211e480a..c123320a9a 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java @@ -64,7 +64,7 @@ public LevelChunk getChunk(int x, int z) { @Override public BlockState toNative(com.sk89q.worldedit.world.block.BlockState state) { - return (BlockState) SpongeAdapter.adapt(state, (ServerWorld) world); + return (BlockState) SpongeAdapter.adapt(state, (ServerWorld) world.get()); } @Override From a24f3dd1ee0857eb0db6f38e3603bb0363fb3fc1 Mon Sep 17 00:00:00 2001 From: Vilsu221 <58680173+Vilsu221@users.noreply.github.com> Date: Wed, 8 Jan 2025 23:00:25 +0200 Subject: [PATCH 3/6] Update api 14 --- .../main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 f6dd3c10f3..0ef45557a5 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 @@ -139,7 +139,8 @@ public void onPluginConstruction(ConstructPluginEvent event) { event.game().eventManager().registerListeners( container, - new SpongeWorldEditListener(this) + new SpongeWorldEditListener(this), + MethodHandles.lookup() ); logger.info("WorldEdit for Sponge (version " + getInternalVersion() + ") is loaded"); From dacc5740c4c387998e7d29d60a183c5f5999ae1b Mon Sep 17 00:00:00 2001 From: Vilsu221 <58680173+Vilsu221@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:57:26 +0200 Subject: [PATCH 4/6] Fixes --- gradle/libs.versions.toml | 2 +- .../src/main/java/com/sk89q/worldedit/sponge/SpongeWorld.java | 1 + .../com/sk89q/worldedit/sponge/SpongeWorldEditListener.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75372c385c..6521c84d7d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,7 +17,7 @@ neoforge-minecraft = "1.21.4" 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 3f61d27b62..d8847de9ca 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 @@ -207,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 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 index 890cdfeb56..af2738f6c5 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java @@ -124,7 +124,7 @@ public void onPlayerInteractBlockPrimary(InteractBlockEvent.Primary.Start event, } @Listener - public void onPlayerInteractBlockSecondary(InteractBlockEvent.Secondary event, @Root ServerPlayer spongePlayer) { + public void onPlayerInteractBlockSecondary(InteractBlockEvent.Secondary.Pre event, @Root ServerPlayer spongePlayer) { if (skipInteractionEvent(event)) { return; } From a5d6e3addd4fde67345fec07b06b06fcaa0a435c Mon Sep 17 00:00:00 2001 From: Vilsu221 <58680173+Vilsu221@users.noreply.github.com> Date: Sat, 18 Jan 2025 19:04:58 +0200 Subject: [PATCH 5/6] PR fixes --- .../sk89q/worldedit/sponge/SpongeAdapter.java | 9 +++++---- .../worldedit/sponge/SpongeBlockRegistry.java | 2 +- .../sk89q/worldedit/sponge/SpongePlayer.java | 2 +- .../com/sk89q/worldedit/sponge/SpongeWorld.java | 6 +++--- .../sk89q/worldedit/sponge/SpongeWorldEdit.java | 10 +--------- .../sponge/SpongeWorldEditListener.java | 17 ++++++++++------- .../internal/SpongeWorldNativeAccess.java | 3 +-- 7 files changed, 22 insertions(+), 27 deletions(-) diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java index c95cff5328..401456b4ae 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeAdapter.java @@ -32,6 +32,7 @@ import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.item.ItemTypes; +import net.minecraft.world.level.block.Block; import org.enginehub.linbus.tree.LinCompoundTag; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; @@ -58,16 +59,16 @@ */ public class SpongeAdapter { - public static org.spongepowered.api.block.BlockState adapt(BlockState blockState, ServerWorld world) { + public static org.spongepowered.api.block.BlockState adapt(BlockState blockState) { int blockStateId = BlockStateIdAccess.getBlockStateId(blockState); if (!BlockStateIdAccess.isValidInternalId(blockStateId)) { return SpongeTransmogrifier.transmogToMinecraft(blockState); } - return world.blockPalette().get(blockStateId, world).orElseThrow(); + return (org.spongepowered.api.block.BlockState) Block.stateById(blockStateId); } - public static BlockState adapt(org.spongepowered.api.block.BlockState blockState, ServerWorld world) { - int blockStateId = world.blockPalette().get(blockState).orElseThrow(); + public static BlockState adapt(org.spongepowered.api.block.BlockState blockState) { + int blockStateId = Block.getId((net.minecraft.world.level.block.state.BlockState) blockState); BlockState worldEdit = BlockStateIdAccess.getBlockStateById(blockStateId); if (worldEdit == null) { return SpongeTransmogrifier.transmogToWorldEdit(blockState); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java index 12becb9a02..699327ac0d 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java @@ -81,7 +81,7 @@ public BlockMaterial getMaterial(BlockType blockType) { @Override public OptionalInt getInternalBlockStateId(BlockState state) { ServerWorld world = Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).orElseThrow(); - org.spongepowered.api.block.BlockState equivalent = SpongeAdapter.adapt(state, world); + org.spongepowered.api.block.BlockState equivalent = SpongeAdapter.adapt(state); return world.blockPalette().get(equivalent); } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java index 02274c472c..1b78106df9 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongePlayer.java @@ -234,7 +234,7 @@ public > void sendFakeBlock(BlockVector3 pos, B bl if (block == null) { player.resetBlockChange(pos.x(), pos.y(), pos.z()); } else { - BlockState spongeBlock = SpongeAdapter.adapt(block.toImmutableState(), player.world()); + BlockState spongeBlock = SpongeAdapter.adapt(block.toImmutableState()); player.sendBlockChange(pos.x(), pos.y(), pos.z(), spongeBlock); if (block instanceof final BaseBlock baseBlock && block.getBlockType().equals(com.sk89q.worldedit.world.block.BlockTypes.STRUCTURE_BLOCK)) { 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 d8847de9ca..7f0af27f22 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 @@ -158,7 +158,7 @@ public Path getStoragePath() { public BlockState getBlock(BlockVector3 position) { return SpongeAdapter.adapt(getWorld().block( position.x(), position.y(), position.z() - ), getWorld()); + )); } @Override @@ -191,7 +191,7 @@ public > boolean setBlock(BlockVector3 position, B ServerWorld world = getWorld(); - org.spongepowered.api.block.BlockState newState = SpongeAdapter.adapt(block.toImmutableState(), world); + org.spongepowered.api.block.BlockState newState = SpongeAdapter.adapt(block.toImmutableState()); boolean didSet = world.setBlock( position.x(), position.y(), position.z(), @@ -408,7 +408,7 @@ public void simulateBlockMine(BlockVector3 position) { @Override public boolean canPlaceAt(BlockVector3 position, com.sk89q.worldedit.world.block.BlockState blockState) { - return ((net.minecraft.world.level.block.state.BlockState) SpongeAdapter.adapt(blockState, getWorld())) + return ((net.minecraft.world.level.block.state.BlockState) SpongeAdapter.adapt(blockState)) .canSurvive( ((LevelReader) getWorld()), new BlockPos(position.x(), position.y(), position.z()) 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 0ef45557a5..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 @@ -34,7 +34,6 @@ 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; @@ -64,7 +63,6 @@ import org.spongepowered.api.event.lifecycle.StoppingEngineEvent; import org.spongepowered.api.registry.RegistryTypes; import org.spongepowered.api.scheduler.Task; -import org.spongepowered.api.world.DefaultWorldKeys; import org.spongepowered.api.world.LocatableBlock; import org.spongepowered.api.world.server.ServerWorld; import org.spongepowered.plugin.PluginContainer; @@ -103,7 +101,6 @@ public static SpongeWorldEdit inst() { private final SpongeConfiguration config; private final Path workingDir; - private InteractionDebouncer debouncer; private SpongePermissionsProvider provider; private SpongePlatform platform; @@ -125,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); @@ -171,7 +167,7 @@ public void serverStarted(StartedEngineEvent event) { BlockType spongeBlockType = Sponge.game().registry(RegistryTypes.BLOCK_TYPE).value( ResourceKey.resolve(input.getBlockType().id()) ); - return SpongeAdapter.adapt(spongeBlockType.defaultState(), Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).orElseThrow()); + return SpongeAdapter.adapt(spongeBlockType.defaultState()); } )); } @@ -380,8 +376,4 @@ public void setPermissionsProvider(SpongePermissionsProvider provider) { public SpongePermissionsProvider getPermissionsProvider() { return provider; } - - public InteractionDebouncer getDebouncer() { - return debouncer; - } } 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 index af2738f6c5..c02cd3b8c5 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEditListener.java @@ -21,6 +21,7 @@ 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; @@ -39,9 +40,11 @@ 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() { @@ -61,13 +64,13 @@ public void onPlayerInteractItemPrimary(InteractItemEvent.Primary event, @Root S WorldEdit we = WorldEdit.getInstance(); SpongePlayer player = SpongeAdapter.adapt(spongePlayer); - Optional previousResult = plugin.getDebouncer().getDuplicateInteractionResult(player); + Optional previousResult = debouncer.getDuplicateInteractionResult(player); if (previousResult.isPresent()) { return; } boolean result = we.handleArmSwing(player); - plugin.getDebouncer().setLastInteraction(player, result); + debouncer.setLastInteraction(player, result); } @Listener @@ -79,7 +82,7 @@ public void onPlayerInteractItemSecondary(InteractItemEvent.Secondary event, @Ro WorldEdit we = WorldEdit.getInstance(); SpongePlayer player = SpongeAdapter.adapt(spongePlayer); - Optional previousResult = plugin.getDebouncer().getDuplicateInteractionResult(player); + Optional previousResult = debouncer.getDuplicateInteractionResult(player); if (previousResult.isPresent()) { if (previousResult.get()) { event.setCancelled(true); @@ -88,7 +91,7 @@ public void onPlayerInteractItemSecondary(InteractItemEvent.Secondary event, @Ro } boolean result = we.handleRightClick(player); - plugin.getDebouncer().setLastInteraction(player, result); + debouncer.setLastInteraction(player, result); if (result) { event.setCancelled(true); @@ -116,7 +119,7 @@ public void onPlayerInteractBlockPrimary(InteractBlockEvent.Primary.Start event, } result = we.handleArmSwing(player) || result; - plugin.getDebouncer().setLastInteraction(player, result); + debouncer.setLastInteraction(player, result); if (result) { event.setCancelled(true); @@ -144,7 +147,7 @@ public void onPlayerInteractBlockSecondary(InteractBlockEvent.Secondary.Pre even } result = we.handleRightClick(player) || result; - plugin.getDebouncer().setLastInteraction(player, result); + debouncer.setLastInteraction(player, result); if (result) { event.setCancelled(true); @@ -154,7 +157,7 @@ public void onPlayerInteractBlockSecondary(InteractBlockEvent.Secondary.Pre even @Listener public void onPlayerQuit(ServerSideConnectionEvent.Disconnect event) { event.profile().ifPresent(profile -> { - plugin.getDebouncer().clearInteraction(profile::uniqueId); + debouncer.clearInteraction(profile::uniqueId); WorldEdit.getInstance().getEventBus() .post(new SessionIdleEvent(new SpongePlayer.SessionKeyImpl(profile.uniqueId(), profile.name().orElseThrow()))); diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java index c123320a9a..022f80ac02 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java @@ -31,7 +31,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.LevelChunk; import org.enginehub.linbus.tree.LinCompoundTag; -import org.spongepowered.api.world.server.ServerWorld; import java.lang.ref.WeakReference; import java.util.Objects; @@ -64,7 +63,7 @@ public LevelChunk getChunk(int x, int z) { @Override public BlockState toNative(com.sk89q.worldedit.world.block.BlockState state) { - return (BlockState) SpongeAdapter.adapt(state, (ServerWorld) world.get()); + return (BlockState) SpongeAdapter.adapt(state); } @Override From 92339fe26d2d1fc9d52da771f855a6346e7ecc5c Mon Sep 17 00:00:00 2001 From: Vilsu221 <58680173+Vilsu221@users.noreply.github.com> Date: Tue, 4 Feb 2025 23:09:26 +0200 Subject: [PATCH 6/6] Bring back vanilla methods --- .../worldedit/sponge/SpongeBlockMaterial.java | 30 ++--- .../worldedit/sponge/SpongeBlockRegistry.java | 21 ++-- .../sponge/internal/ExtendedChunk.java | 43 +++++++ .../sponge/internal/SpongeTransmogrifier.java | 114 ++++++++++-------- .../internal/SpongeWorldNativeAccess.java | 6 + 5 files changed, 141 insertions(+), 73 deletions(-) create mode 100644 worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java index 4b0d1d992f..861b9d633b 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockMaterial.java @@ -21,11 +21,8 @@ import com.sk89q.worldedit.world.registry.BlockMaterial; import com.sk89q.worldedit.world.registry.PassthroughBlockMaterial; -import org.spongepowered.api.block.BlockState; -import org.spongepowered.api.data.Keys; -import org.spongepowered.api.data.type.MatterTypes; -import org.spongepowered.api.data.type.PushReactions; -import org.spongepowered.api.tag.BlockTypeTags; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.PushReaction; import javax.annotation.Nullable; @@ -45,52 +42,55 @@ public SpongeBlockMaterial(BlockState block, @Nullable BlockMaterial secondary) @Override public boolean isAir() { - return block.type().is(BlockTypeTags.AIR) || super.isAir(); + return block.isAir() || super.isAir(); } @Override public boolean isOpaque() { - return ((net.minecraft.world.level.block.state.BlockState) block).canOcclude(); + return block.canOcclude(); } @Override + @SuppressWarnings("deprecation") public boolean isLiquid() { - return block.require(Keys.MATTER_TYPE) == MatterTypes.LIQUID.get(); + return block.liquid(); } @Override + @SuppressWarnings("deprecation") public boolean isSolid() { - return block.require(Keys.IS_SOLID); + return block.isSolid(); } @Override public boolean isFragileWhenPushed() { - return block.require(Keys.PUSH_REACTION) == PushReactions.DESTROY.get(); + return block.getPistonPushReaction() == PushReaction.DESTROY; } @Override public boolean isUnpushable() { - return block.require(Keys.PUSH_REACTION) == PushReactions.BLOCK.get(); + return block.getPistonPushReaction() == PushReaction.BLOCK; } @Override + @SuppressWarnings("deprecation") public boolean isMovementBlocker() { - return !block.require(Keys.IS_PASSABLE); + return block.blocksMotion(); } @Override public boolean isBurnable() { - return block.require(Keys.BURNABLE); + return block.ignitedByLava(); } @Override public boolean isToolRequired() { - return ((net.minecraft.world.level.block.state.BlockState) block).requiresCorrectToolForDrops(); + return block.requiresCorrectToolForDrops(); } @Override public boolean isReplacedDuringPlacement() { - return block.require(Keys.IS_REPLACEABLE); + return block.canBeReplaced(); } } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java index 699327ac0d..f692e9c278 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeBlockRegistry.java @@ -26,12 +26,11 @@ import com.sk89q.worldedit.world.block.BlockType; import com.sk89q.worldedit.world.registry.BlockMaterial; import com.sk89q.worldedit.world.registry.BundledBlockRegistry; +import net.minecraft.world.level.block.Block; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; import org.spongepowered.api.registry.RegistryTypes; import org.spongepowered.api.state.StateProperty; -import org.spongepowered.api.world.DefaultWorldKeys; -import org.spongepowered.api.world.server.ServerWorld; import java.util.Collection; import java.util.HashMap; @@ -57,10 +56,14 @@ public BlockMaterial getMaterial(BlockType blockType) { .value(ResourceKey.resolve(blockType.id())); return materialMap.computeIfAbsent( spongeBlockType.defaultState(), - blockState -> new SpongeBlockMaterial( - blockState, - super.getMaterial(blockType) - ) + m -> { + net.minecraft.world.level.block.state.BlockState blockState = + (net.minecraft.world.level.block.state.BlockState) m; + return new SpongeBlockMaterial( + blockState, + super.getMaterial(blockType) + ); + } ); } @@ -80,9 +83,9 @@ public BlockMaterial getMaterial(BlockType blockType) { @Override public OptionalInt getInternalBlockStateId(BlockState state) { - ServerWorld world = Sponge.server().worldManager().world(DefaultWorldKeys.DEFAULT).orElseThrow(); org.spongepowered.api.block.BlockState equivalent = SpongeAdapter.adapt(state); - - return world.blockPalette().get(equivalent); + return OptionalInt.of(Block.getId( + (net.minecraft.world.level.block.state.BlockState) equivalent + )); } } diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java new file mode 100644 index 0000000000..47e0451e27 --- /dev/null +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/ExtendedChunk.java @@ -0,0 +1,43 @@ +/* + * 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.internal; + +import com.sk89q.worldedit.util.SideEffect; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.chunk.LevelChunk; + +import javax.annotation.Nullable; + +public interface ExtendedChunk { + /** + * {@link LevelChunk#setBlockState(BlockPos, BlockState, boolean)} with the extra + * {@link SideEffect#UPDATE} flag. + * + * @param pos the position to set + * @param state the state to set + * @param moved I honestly have no idea and can't be bothered to investigate, we pass {@code + * false} + * @param update the update flag, see side-effect for details + * @return the old block state, or {@code null} if unchanged + */ + @Nullable + BlockState setBlockState(BlockPos pos, BlockState state, boolean moved, boolean update); +} diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java index ddff3ada64..0bedfe64ab 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeTransmogrifier.java @@ -31,13 +31,10 @@ import com.sk89q.worldedit.util.Direction; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockType; +import net.minecraft.util.StringRepresentable; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; -import org.spongepowered.api.data.type.StringRepresentable; import org.spongepowered.api.registry.RegistryTypes; -import org.spongepowered.api.state.BooleanStateProperty; -import org.spongepowered.api.state.EnumStateProperty; -import org.spongepowered.api.state.IntegerStateProperty; import org.spongepowered.api.state.StateProperty; import java.util.Comparator; @@ -53,21 +50,31 @@ public class SpongeTransmogrifier { private static final LoadingCache, Property> PROPERTY_CACHE = CacheBuilder.newBuilder().build(new CacheLoader<>() { @Override public Property load(StateProperty property) { - return switch (property) { - case BooleanStateProperty stateProperty -> - new BooleanProperty(property.name(), ImmutableList.copyOf(stateProperty.possibleValues())); - case IntegerStateProperty stateProperty -> new IntegerProperty(property.name(), ImmutableList.copyOf(stateProperty.possibleValues())); - case EnumStateProperty stateProperty when stateProperty.valueClass() == org.spongepowered.api.util.Direction.class -> - new DirectionalProperty(property.name(), stateProperty.possibleValues().stream() - .map(x -> adaptDirection((org.spongepowered.api.util.Direction) x)) - .toList()); - case EnumStateProperty stateProperty -> - new EnumProperty(property.name(), ((net.minecraft.world.level.block.state.properties.EnumProperty) (Object) stateProperty).getPossibleValues().stream() - .map(net.minecraft.util.StringRepresentable::getSerializedName) - .toList()); - default -> throw new IllegalStateException("Unknown property type"); - }; - + net.minecraft.world.level.block.state.properties.Property nativeProperty = + (net.minecraft.world.level.block.state.properties.Property) property; + String propertyName = nativeProperty.getName(); + if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.BooleanProperty) { + return new BooleanProperty(propertyName, + ImmutableList.copyOf(((net.minecraft.world.level.block.state.properties.BooleanProperty) nativeProperty).getPossibleValues())); + } + if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.IntegerProperty) { + return new IntegerProperty(propertyName, + ImmutableList.copyOf(((net.minecraft.world.level.block.state.properties.IntegerProperty) nativeProperty).getPossibleValues())); + } + if (isDirectionProperty(nativeProperty)) { + return new DirectionalProperty(propertyName, + ((net.minecraft.world.level.block.state.properties.EnumProperty) nativeProperty).getPossibleValues().stream() + .map(x -> adaptDirection((net.minecraft.core.Direction) x)) + .toList() + ); + } + if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { + return new EnumProperty(propertyName, + ((net.minecraft.world.level.block.state.properties.EnumProperty) nativeProperty).getPossibleValues().stream() + .map(StringRepresentable::getSerializedName) + .toList()); + } + throw new IllegalStateException("Unknown property type"); } }); @@ -77,24 +84,28 @@ public static Property transmogToWorldEditProperty(StateProperty property) private static Map, Object> transmogToWorldEditProperties( BlockType block, - org.spongepowered.api.block.BlockState blockState + net.minecraft.world.level.block.state.BlockState blockState ) { Map, Object> properties = new TreeMap<>(Comparator.comparing(Property::getName)); - for (StateProperty stateProperty: blockState.stateProperties()) { - Object value = ((net.minecraft.world.level.block.state.BlockState) blockState) - .getValue((net.minecraft.world.level.block.state.properties.Property) stateProperty); - if (stateProperty.valueClass() == org.spongepowered.api.util.Direction.class) { - org.spongepowered.api.util.Direction nativeDirectionValue = (org.spongepowered.api.util.Direction) value; + for (net.minecraft.world.level.block.state.properties.Property nativeProperty: blockState.getProperties()) { + Object value = blockState.getValue(nativeProperty); + if (isDirectionProperty(nativeProperty)) { + net.minecraft.core.Direction nativeDirectionValue = (net.minecraft.core.Direction) value; value = adaptDirection(nativeDirectionValue); - } else if (stateProperty instanceof EnumStateProperty) { - value = ((StringRepresentable) value).serializationString(); + } else if (nativeProperty instanceof net.minecraft.world.level.block.state.properties.EnumProperty) { + value = ((StringRepresentable) value).getSerializedName(); } - properties.put(block.getProperty(stateProperty.name()), value); + properties.put(block.getProperty(nativeProperty.getName()), value); } return properties; } - private static Direction adaptDirection(org.spongepowered.api.util.Direction direction) { + private static boolean isDirectionProperty(net.minecraft.world.level.block.state.properties.Property property) { + return property instanceof net.minecraft.world.level.block.state.properties.EnumProperty + && property.getValueClass().isAssignableFrom(net.minecraft.core.Direction.class); + } + + private static Direction adaptDirection(net.minecraft.core.Direction direction) { switch (direction) { case UP: return Direction.UP; @@ -113,33 +124,36 @@ private static Direction adaptDirection(org.spongepowered.api.util.Direction dir } } - private static org.spongepowered.api.util.Direction adaptDirection(Direction direction) { + private static net.minecraft.core.Direction adaptDirection(Direction direction) { switch (direction) { case UP: - return org.spongepowered.api.util.Direction.UP; + return net.minecraft.core.Direction.UP; case DOWN: - return org.spongepowered.api.util.Direction.DOWN; + return net.minecraft.core.Direction.DOWN; case EAST: - return org.spongepowered.api.util.Direction.EAST; + return net.minecraft.core.Direction.EAST; case WEST: - return org.spongepowered.api.util.Direction.WEST; + return net.minecraft.core.Direction.WEST; case NORTH: - return org.spongepowered.api.util.Direction.NORTH; + return net.minecraft.core.Direction.NORTH; case SOUTH: - return org.spongepowered.api.util.Direction.SOUTH; + return net.minecraft.core.Direction.SOUTH; default: throw new AssertionError("New direction added: " + direction); } } - private static StateProperty findPropertyByName(org.spongepowered.api.block.BlockState blockState, String propertyName) { - for (StateProperty property: blockState.stateProperties()) { - if (property.name().equals(propertyName)) { + private static net.minecraft.world.level.block.state.properties.Property findPropertyByName( + net.minecraft.world.level.block.state.BlockState blockState, + String propertyName + ) { + for (net.minecraft.world.level.block.state.properties.Property property: blockState.getProperties()) { + if (property.getName().equals(propertyName)) { return property; } } - throw new IllegalStateException("Missing property in " + blockState.asString() + ": " + propertyName); + throw new IllegalStateException("Missing property in " + blockState.getBlock() + ": " + propertyName); } @SuppressWarnings({ "unchecked", "rawtypes" }) @@ -147,19 +161,20 @@ private static org.spongepowered.api.block.BlockState transmogToMinecraftPropert org.spongepowered.api.block.BlockState blockState, Map, Object> states ) { - org.spongepowered.api.block.BlockState nativeBlockState = blockState; - + net.minecraft.world.level.block.state.BlockState nativeBlockState = + (net.minecraft.world.level.block.state.BlockState) blockState; for (Map.Entry, Object> stateEntry: states.entrySet()) { Property property = stateEntry.getKey(); Object value = stateEntry.getValue(); - StateProperty nativeProperty = findPropertyByName(blockState, property.getName()); - Comparable nativeValue; + net.minecraft.world.level.block.state.properties.Property nativeProperty = + findPropertyByName(nativeBlockState, property.getName()); + Comparable nativeValue; if (property instanceof DirectionalProperty) { Direction directionValue = (Direction) value; nativeValue = adaptDirection(directionValue); } else if (property instanceof EnumProperty) { String valueName = (String) value; - Optional> nativeValueOpt = nativeProperty.parseValue(valueName); + Optional> nativeValueOpt = nativeProperty.getValue(valueName); if (nativeValueOpt.isEmpty()) { throw new IllegalStateException("Failed to parse " + valueName + " into " + property.getName()); } @@ -167,11 +182,11 @@ private static org.spongepowered.api.block.BlockState transmogToMinecraftPropert } else { nativeValue = (Comparable) value; } - - nativeBlockState = (org.spongepowered.api.block.BlockState) nativeBlockState.withStateProperty(nativeProperty, nativeValue).orElseThrow(); + nativeBlockState = nativeBlockState.setValue( + (net.minecraft.world.level.block.state.properties.Property) nativeProperty, (Comparable) nativeValue); } - return nativeBlockState; + return (org.spongepowered.api.block.BlockState) nativeBlockState; } public static org.spongepowered.api.block.BlockState transmogToMinecraft(BlockState blockState) { @@ -186,7 +201,8 @@ public static BlockState transmogToWorldEdit(org.spongepowered.api.block.BlockSt BlockType blockType = BlockType.REGISTRY.get( blockState.type().key(RegistryTypes.BLOCK_TYPE).asString() ); - return blockType.getState(transmogToWorldEditProperties(blockType, blockState)); + return blockType.getState(transmogToWorldEditProperties(blockType, + (net.minecraft.world.level.block.state.BlockState) blockState)); } private SpongeTransmogrifier() { diff --git a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java index 022f80ac02..f831404759 100644 --- a/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java +++ b/worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/internal/SpongeWorldNativeAccess.java @@ -21,6 +21,7 @@ import com.sk89q.worldedit.internal.wna.WorldNativeAccess; import com.sk89q.worldedit.sponge.SpongeAdapter; +import com.sk89q.worldedit.util.SideEffect; import com.sk89q.worldedit.util.SideEffectSet; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; @@ -74,6 +75,11 @@ public BlockState getBlockState(LevelChunk chunk, BlockPos position) { @Nullable @Override public BlockState setBlockState(LevelChunk chunk, BlockPos position, BlockState state) { + if (chunk instanceof ExtendedChunk) { + return ((ExtendedChunk) chunk).setBlockState( + position, state, false, sideEffectSet.shouldApply(SideEffect.UPDATE) + ); + } return chunk.setBlockState(position, state, false); }