chore: merge api-11 fixes and updates

Signed-off-by: Gabriel Harris-Rouquette <gabizou@me.com>

Author: gabizou

SpongeAPI

@@ -1503,6 +1503,14 @@
             <sha256 value="ecd2df597d488e91f40a345a716f3d4ac1caa30b1d21ae33d1bc24e9f656744d" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="io.github.juuxel" name="union-relauncher" version="1.1.1">
+         <artifact name="union-relauncher-1.1.1.jar">
+            <sha256 value="e00285ead453f947c9242b317af43c4249029f66e60f5596c5bdb59302763947" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="union-relauncher-1.1.1.pom">
+            <sha256 value="d1eb0e9bca96dd7a15b724f30d34a775cd423b0faf7ac2c15b4705e81c35ff8d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.github.juuxel" name="unprotect" version="1.2.0">
          <artifact name="unprotect-1.2.0.jar">
             <sha256 value="d6b8259d9fcee6d21377e4e1ae0e7fecc2e0d8d2d40d83c020e2ca3dde57ec42" origin="Generated by Gradle"/>
@@ -1851,6 +1859,14 @@
             <sha256 value="b1854f5544c3f40be358f4f674fbb7247b1b853e79a1d5b1aa2fcb94898bbeb2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="net.fabricmc" name="tiny-remapper" version="0.10.3">
+         <artifact name="tiny-remapper-0.10.3.jar">
+            <sha256 value="8b0abcbdc373f85b04dce6adf9db31922827957718b31f39791e7c254df736b2" origin="Generated by Gradle"/>
+         </artifact>
+         <artifact name="tiny-remapper-0.10.3.module">
+            <sha256 value="71987b3ab7d4ffd7d18002ed1111e8a2bb42c26cd7395d99db5145eeb0b60685" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="net.java" name="jvnet-parent" version="3">
          <artifact name="jvnet-parent-3.pom">
             <sha256 value="30f5789efa39ddbf96095aada3fc1260c4561faf2f714686717cb2dc5049475a" origin="Generated by Gradle"/>

gradle/verification-metadata.xml

@@ -116,9 +116,6 @@ public void establishEarlyGlobalRegistries() {
         holder.setRootMinecraftRegistry((Registry<Registry<?>>) BuiltInRegistries.REGISTRY);
 
         SpongeRegistries.registerEarlyGlobalRegistries(holder);
-
-        // Plugin registries
-        this.game.eventManager().post(new AbstractRegisterRegistryEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game));
     }
 
     @Override
@@ -140,6 +137,9 @@ public void establishGlobalRegistries(final RegistryAccess.Frozen registryAccess
             case DIMENSIONS -> {
                 SpongeRegistries.registerGlobalRegistriesDimensionLayer((SpongeRegistryHolder) this.game, registryAccess, this.featureFlags);
 
+                // Plugin registries
+                this.game.eventManager().post(new AbstractRegisterRegistryEvent.GameScopedImpl(Cause.of(EventContext.empty(), this.game), this.game));
+
                 // Freeze Sponge Root - Registries are now available
                 holder.registryHolder().freezeSpongeRootRegistry();
             }

src/main/java/org/spongepowered/common/SpongeLifecycle.java

@@ -24,6 +24,8 @@
  */
 package org.spongepowered.common;
 
+import net.minecraft.core.BlockPos;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.Server;
 import org.spongepowered.common.command.manager.SpongeCommandManager;
 import org.spongepowered.common.profile.SpongeGameProfileManager;
@@ -47,6 +49,10 @@ public interface SpongeServer extends SpongeEngine, Server {
 
     UsernameCache getUsernameCache();
 
+    @Nullable Integer getBlockDestructionId(BlockPos pos);
+
+    int getOrCreateBlockDestructionId(BlockPos pos);
+
     SpongeUserManager userManager();
 
     @Override

src/main/java/org/spongepowered/common/SpongeServer.java

@@ -34,6 +34,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.minecraft.commands.Commands;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.server.MinecraftServer;
@@ -51,6 +52,7 @@
 import net.minecraft.world.level.storage.LevelStorageSource;
 import net.minecraft.world.level.storage.WorldData;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.spongepowered.api.Game;
 import org.spongepowered.api.Server;
 import org.spongepowered.api.Sponge;
@@ -479,6 +481,16 @@ public UsernameCache getUsernameCache() {
         return this.api$usernameCache;
     }
 
+    @Override
+    public @Nullable Integer getBlockDestructionId(BlockPos pos) {
+        return this.api$blockDestructionIdCache.get(pos).orElse(null);
+    }
+
+    @Override
+    public int getOrCreateBlockDestructionId(BlockPos pos) {
+        return this.api$blockDestructionIdCache.getOrCreate(pos);
+    }
+
     @Override
     public BlockDestructionIdCache getBlockDestructionIdCache() {
         return this.api$blockDestructionIdCache;

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/server/MinecraftServerMixin_API.java

@@ -34,10 +34,12 @@
 import net.kyori.adventure.text.Component;
 import net.minecraft.advancements.Advancement;
 import net.minecraft.advancements.AdvancementHolder;
+import net.minecraft.core.BlockPos;
 import net.minecraft.network.Connection;
 import net.minecraft.network.chat.ChatType;
 import net.minecraft.network.chat.MessageSignature;
 import net.minecraft.network.chat.PlayerChatMessage;
+import net.minecraft.network.protocol.game.ClientboundBlockDestructionPacket;
 import net.minecraft.network.protocol.game.ClientboundDeleteChatPacket;
 import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
 import net.minecraft.resources.ResourceLocation;
@@ -115,7 +117,9 @@ public abstract class ServerPlayerMixin_API extends PlayerMixin_API implements S
     // @formatter:on
 
 
-    @Shadow @Nullable private Vec3 enteredLavaOnVehiclePosition;
+    @Shadow
+    @Nullable
+    private Vec3 enteredLavaOnVehiclePosition;
     private volatile Pointers api$pointers;
 
     private final TabList api$tabList = new SpongeTabList((net.minecraft.server.level.ServerPlayer) (Object) this);
@@ -152,7 +156,7 @@ public ServerSideConnection connection() {
     /**
      * @author Minecrell - August 22nd, 2016
      * @reason Use InetSocketAddress#getHostString() where possible (instead of
-     *     inspecting SocketAddress#toString()) to support IPv6 addresses
+     * inspecting SocketAddress#toString()) to support IPv6 addresses
      */
     @Overwrite
     public String getIpAddress() {
@@ -207,6 +211,27 @@ public boolean hasPlayedBefore() {
         return timeSinceFirstJoined.getSeconds() > 0;
     }
 
+    @Override
+    public void sendBlockProgress(final int x, final int y, final int z, final double progress) {
+        if (progress < 0 || progress > 1) {
+            throw new IllegalArgumentException("Progress must be between 0 and 1");
+        }
+
+        final BlockPos pos = new BlockPos(x, y, z);
+        final int id = ((SpongeServer) this.server).getOrCreateBlockDestructionId(pos);
+        final int progressStage = progress == 1 ? 9 : (int) (progress * 10);
+        this.connection.send(new ClientboundBlockDestructionPacket(id, pos, progressStage));
+    }
+
+    @Override
+    public void resetBlockProgress(final int x, final int y, final int z) {
+        final BlockPos pos = new BlockPos(x, y, z);
+        final Integer id = ((SpongeServer) this.server).getBlockDestructionId(pos);
+        if (id != null) {
+            this.connection.send(new ClientboundBlockDestructionPacket(id, pos, -1));
+        }
+    }
+
     @Override
     public boolean respawn() {
         if (this.impl$isFake) {
@@ -275,21 +300,21 @@ public Optional<WorldBorder> setWorldBorder(final @Nullable WorldBorder border)
             return currentBorder; // do not fire an event since nothing would have changed
         }
         final ChangeWorldBorderEvent.Player event =
-                SpongeEventFactory.createChangeWorldBorderEventPlayer(PhaseTracker.getCauseStackManager().currentCause(),
-                        Optional.ofNullable(border), Optional.ofNullable(border), this, Optional.ofNullable(border));
+            SpongeEventFactory.createChangeWorldBorderEventPlayer(PhaseTracker.getCauseStackManager().currentCause(),
+                Optional.ofNullable(border), Optional.ofNullable(border), this, Optional.ofNullable(border));
         if (SpongeCommon.post(event)) {
             return currentBorder;
         }
 
         final net.minecraft.world.level.border.@Nullable WorldBorder oldWorldBorder = ((ServerPlayerBridge) this).bridge$getWorldBorder();
         if (oldWorldBorder != null) { // is the world border about to be unset?
             ((WorldBorderAccessor) oldWorldBorder).accessor$listeners().remove(
-                    ((ServerPlayerBridge) this).bridge$getWorldBorderListener()); // remove the listener, if so
+                ((ServerPlayerBridge) this).bridge$getWorldBorderListener()); // remove the listener, if so
         }
         final Optional<WorldBorder> toSet = event.newBorder();
         if (toSet.isPresent()) {
             final net.minecraft.world.level.border.WorldBorder mutableWorldBorder =
-                    new net.minecraft.world.level.border.WorldBorder();
+                new net.minecraft.world.level.border.WorldBorder();
             ((WorldBorderBridge) mutableWorldBorder).bridge$applyFrom(toSet.get());
             ((ServerPlayerBridge) this).bridge$replaceWorldBorder(mutableWorldBorder);
             mutableWorldBorder.addListener(((ServerPlayerBridge) this).bridge$getWorldBorderListener());
@@ -439,7 +464,7 @@ public void sendResourcePacks(final @NonNull ResourcePackRequest request) {
     }
 
     @Override
-    public void removeResourcePacks(final @NonNull UUID id, final @NonNull UUID @NonNull... others) {
+    public void removeResourcePacks(final @NonNull UUID id, final @NonNull UUID @NonNull ... others) {
         ((ServerCommonPacketListenerImplBridge) this.connection).bridge$removeResourcePacks(id, others);
     }
 

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/server/level/ServerPlayerMixin_API.java

@@ -27,15 +27,18 @@
 import net.kyori.adventure.sound.Sound;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.protocol.game.ClientboundBlockUpdatePacket;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.util.Tuple;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
@@ -261,6 +264,19 @@ public void resetBlockProgress(final int x, final int y, final int z) {
         ViewerPacketUtil.resetBlockProgress(x, y, z, this.engine()).ifPresent(((ViewerBridge) this)::bridge$sendToViewer);
     }
 
+    @Override
+    public void sendBlockChange(final int x, final int y, final int z, final org.spongepowered.api.block.BlockState state) {
+        Objects.requireNonNull(state, "state");
+
+        final ClientboundBlockUpdatePacket packet = new ClientboundBlockUpdatePacket(new BlockPos(x, y, z), (BlockState) state);
+
+        ((net.minecraft.world.level.Level) (Object) this).players()
+            .stream()
+            .filter(ServerPlayer.class::isInstance)
+            .map(ServerPlayer.class::cast)
+            .forEach(p -> p.connection.send(packet));
+    }
+
     // Audience
 
     @Override
@@ -289,7 +305,7 @@ public void addBlockEntity(final int x, final int y, final int z, final BlockEnt
 
         // Retrieve a "blank" block entity from the one we just created (or already existed) through sponge.
         final net.minecraft.world.level.block.entity.BlockEntity mcNewBlockEntity = (net.minecraft.world.level.block.entity.BlockEntity) this.blockEntity(x, y, z)
-                .orElseThrow(() -> new IllegalStateException("Failed to create Block Entity at " + this.location(Vector3i.from(x, y, z))));
+            .orElseThrow(() -> new IllegalStateException("Failed to create Block Entity at " + this.location(Vector3i.from(x, y, z))));
 
         // Load the data into it.
         mcNewBlockEntity.loadWithComponents(tag, mcOriginalBlockEntity.getLevel().registryAccess());
@@ -381,7 +397,7 @@ public VolumeStream<W, Entity> entityStream(final Vector3i min, final Vector3i m
             Objects.requireNonNull(options, "options"));
 
         final boolean shouldCarbonCopy = options.carbonCopy();
-        final Vector3i size = max.sub(min).add(1, 1 ,1);
+        final Vector3i size = max.sub(min).add(1, 1, 1);
         final @MonotonicNonNull ObjectArrayMutableEntityBuffer backingVolume;
         if (shouldCarbonCopy) {
             backingVolume = new ObjectArrayMutableEntityBuffer(min, size);

src/mixins/java/org/spongepowered/common/mixin/api/minecraft/world/level/LevelMixin_API.java

@@ -26,6 +26,7 @@
 
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
@@ -38,11 +39,20 @@
 public abstract class EntitySelectorMixin {
 
     @Shadow @Final @Mutable public static Predicate<Entity> NO_SPECTATORS = entity -> {
-        if (entity instanceof VanishableBridge && ((VanishableBridge) entity).bridge$vanishState().invisible()) {
+        if (entity instanceof VanishableBridge vb && vb.bridge$vanishState().invisible()) {
             // Sponge: Count vanished entities as spectating
             return false;
         }
         return !entity.isSpectator();
     };
 
+    @Shadow @Final @Mutable public static Predicate<Entity> NO_CREATIVE_OR_SPECTATOR = $$0 -> {
+        if ($$0 instanceof VanishableBridge vb && vb.bridge$vanishState().invisible()) {
+            // Sponge: Count vanished entities as spectating
+            return false;
+        }
+        return !($$0 instanceof Player) || !$$0.isSpectator() && !((Player)$$0).isCreative();
+    };
+
+
 }

src/mixins/java/org/spongepowered/common/mixin/core/world/entity/EntitySelectorMixin.java

@@ -0,0 +1,58 @@
+/*
+ * This file is part of Sponge, licensed under the MIT License (MIT).
+ *
+ * Copyright (c) SpongePowered <https://www.spongepowered.org>
+ * Copyright (c) contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.spongepowered.common.mixin.core.world.entity.ai.sensing;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.sensing.NearestLivingEntitySensor;
+import net.minecraft.world.phys.AABB;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.common.bridge.data.VanishableBridge;
+
+import java.util.List;
+import java.util.function.Predicate;
+
+@Mixin(NearestLivingEntitySensor.class)
+public class NearestLivingEntitySensorMixin<T extends LivingEntity> extends SensorMixin<T> {
+
+    @Redirect(method = "doTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;getEntitiesOfClass(Ljava/lang/Class;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;)Ljava/util/List;"))
+    private <T extends Entity> List<T> impl$ignoreVanishedEntities(
+        final ServerLevel instance, final Class<T> aClass, final AABB aabb,
+        final Predicate<? super T> predicate
+    ) {
+        return instance.getEntitiesOfClass(aClass, aabb, entity -> {
+            if (entity instanceof VanishableBridge v) {
+                final var state = v.bridge$vanishState();
+                if (state.invisible() || state.untargetable()) {
+                    return false;
+                }
+            }
+            return predicate.test(entity);
+        });
+    }
+}