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 698c7242d9..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 @@ -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 @@ -345,7 +352,6 @@ public int getBlockLightLevel(BlockVector3 position) { int groundLight = getWorld().light(LightTypes.BLOCK, position.x(), position.y(), position.z()); return Math.max(skyLight, groundLight); - } @Override @@ -478,6 +484,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()))); + }); + } + +}