Merge branch 'api-15' into api-16

# Conflicts:
#	src/main/java/org/spongepowered/common/entity/player/SpongeUserData.java

Author: Yeregorix

src/main/java/org/spongepowered/common/entity/SpongeEntityArchetype.java

@@ -174,7 +174,7 @@ public EntitySnapshot toSnapshot(final ServerLocation location) {
         final CompoundTag newCompound = this.compound.copy();
         final Vector3d pos = location.position();
         newCompound.put(Constants.Entity.ENTITY_POSITION, Constants.NBT.newDoubleNBTList(pos.x(), pos.y(), pos.z()));
-        newCompound.putString(Constants.Sponge.World.WORLD_KEY, location.worldKey().formatted());
+        newCompound.putString(Constants.Sponge.World.DIMENSION, location.worldKey().formatted());
         builder.compound = newCompound;
         builder.worldKey = location.world().properties().key();
         builder.position = pos;

src/main/java/org/spongepowered/common/entity/player/SpongeUserData.java

@@ -229,7 +229,7 @@ public void readCompound(final CompoundTag compound) {
         this.reset();
         this.compound = compound;
 
-        compound.read(Constants.Sponge.World.WORLD_KEY, ResourceLocation.CODEC)
+        compound.read(Constants.Sponge.World.DIMENSION, ResourceLocation.CODEC)
             .ifPresent(key -> this.worldKey = (ResourceKey) (Object) key);
 
         final var rotation = compound.read(Constants.Entity.ENTITY_ROTATION, Rotations.CODEC).orElse(new Rotations(0, 0, 0));
@@ -248,7 +248,7 @@ public void readCompound(final CompoundTag compound) {
     public void writeCompound(final CompoundTag compound) {
         final var holder = SpongeCommon.scopedHolder();
         final var output = TagValueOutput.createWithContext(ProblemReporter.DISCARDING, holder);
-        output.putString(Constants.Sponge.World.WORLD_KEY, this.worldKey.formatted());
+        output.putString(Constants.Sponge.World.DIMENSION, this.worldKey.formatted());
 
         this.loadInventory();
         this.loadEnderInventory();

src/main/java/org/spongepowered/common/util/Constants.java

@@ -293,6 +293,7 @@ public static final class World {
             public static final String LEVEL_SPONGE_DAT_NEW = org.spongepowered.common.util.Constants.Sponge.World.LEVEL_SPONGE_DAT + "_new";
             public static final String UNIQUE_ID = "UUID";
             public static final String DIMENSIONS_DIRECTORY = "dimensions";
+            public static final String DIMENSION = "Dimension";
             public static final String WORLD_KEY = "WorldKey";
         }
 

src/main/java/org/spongepowered/common/world/teleport/SpongeTeleportHelper.java

@@ -80,15 +80,16 @@ private Stream<Vector3i> getBlockLocations(ServerLocation worldLocation, int hei
         int worldBorderMaxX = GenericMath.floor(worldBorder.getCenterX() + radius);
         int worldBorderMaxZ = GenericMath.floor(worldBorder.getCenterZ() + radius);
 
-        // Get the World and get the maximum Y value.
+        // Get the World and get the minimum and maximum Y value.
         int worldMaxY = worldLocation.world().max().y();
+        int worldMinY = worldLocation.world().min().y();
 
         Vector3i vectorLocation = worldLocation.blockPosition();
 
         // We use clamp to remain within the world confines, so we don't waste time checking blocks outside of the
         // world border and the world height.
-        int minY = GenericMath.clamp(vectorLocation.y() - height, 0, worldMaxY);
-        int maxY = GenericMath.clamp(vectorLocation.y() + height, 0, worldMaxY);
+        int minY = GenericMath.clamp(vectorLocation.y() - height, worldMinY, worldMaxY);
+        int maxY = GenericMath.clamp(vectorLocation.y() + height, worldMinY, worldMaxY);
 
         int minX = GenericMath.clamp(vectorLocation.x() - width, worldBorderMinX, worldBorderMaxX);
         int maxX = GenericMath.clamp(vectorLocation.x() + width, worldBorderMinX, worldBorderMaxX);
@@ -182,7 +183,7 @@ private boolean isFloorSafe(Vector3i currentTarget, World world, Map<Vector3i, B
     }
 
     private BlockData getBlockData(Vector3i vector3i, World world, Map<Vector3i, BlockData> cache, Collection<TeleportHelperFilter> filters) {
-        if (vector3i.y() < 0) {
+        if (vector3i.y() < world.min().y()) {
             // Anything below this isn't safe, no point going further.
             return new BlockData();
         }

src/main/resources/common.accesswidener

@@ -19,3 +19,4 @@ accessible class net/minecraft/network/protocol/game/ServerboundInteractPacket$A
 accessible class net/minecraft/world/entity/monster/SpellcasterIllager$IllagerSpell
 accessible class net/minecraft/world/level/biome/Biome$ClimateSettings
 accessible class net/minecraft/core/MappedRegistry$TagSet
+accessible class net/minecraft/server/level/ServerChunkCache$MainThreadExecutor

src/mixins/java/org/spongepowered/common/mixin/core/nbt/CompoundTagMixin.java

@@ -24,7 +24,6 @@
  */
 package org.spongepowered.common.mixin.core.nbt;
 
-import com.google.common.collect.Maps;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import org.apache.logging.log4j.Level;
@@ -33,44 +32,32 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.common.SpongeCommon;
 import org.spongepowered.common.util.PrettyPrinter;
 
 import java.util.Map;
 import java.util.function.BiConsumer;
 
-/**
- * @author Zidane - Minecraft 1.14.4
- *
- * Normally this shouldn't be necessary, however, due to unforseen consequences
- * of creating block snapshots, there are corner cases where mod authors are
- * setting nulls into the compound for their tile entities. This overwrite
- * prevents an NPE crashing the game. A pretty warning message will be printed
- * out for the client to see and report to both Sponge and the mod author.
- */
 @Mixin(CompoundTag.class)
 public abstract class CompoundTagMixin {
 
     // @formatter:off
     @Shadow @Final private Map<String, Tag> tags;
     // @formatter:on
 
-    @Redirect(method = "copy()Lnet/minecraft/nbt/CompoundTag;",
-        at = @At(value = "INVOKE",
-            target ="Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V"))
-    private <K, V> void impl$checkForOverflowOnCopy(Map<K, V> instance, BiConsumer<? super K, ? super V> consumer) {
-        instance.forEach((k, v) -> {
+    @ModifyArg(method = "copy()Lnet/minecraft/nbt/CompoundTag;", at = @At(value = "INVOKE", target = "Ljava/util/Map;forEach(Ljava/util/function/BiConsumer;)V"), require = 0)
+    private BiConsumer<String, Tag> impl$checkForOverflowOnCopy(final BiConsumer<String, Tag> putCopy) {
+        return (key, tag) -> {
             try {
-                consumer.accept(k, v);
-            } catch (StackOverflowError e) {
+                putCopy.accept(key, tag);
+            } catch (final StackOverflowError e) {
                 final PrettyPrinter printer = new PrettyPrinter(60)
                     .add("StackOverflow from trying to copy this compound")
                     .centre()
                     .hr();
                 printer.addWrapped(70, "Sponge caught a stack overflow error, printing out some special"
-                                       + " handling and printouts to assist in finding out where this"
-                                       + " recursion is coming from.");
+                    + " handling and printouts to assist in finding out where this"
+                    + " recursion is coming from.");
                 printer.add();
                 try {
                     printer.addWrapped(80, "%s : %s", "This compound", this);
@@ -89,23 +76,8 @@ public abstract class CompoundTagMixin {
                 }
                 printer.add();
                 printer.log(SpongeCommon.logger(), Level.ERROR);
+                throw e;
             }
-        });
-    }
-
-    @ModifyArg(method = "copy()Lnet/minecraft/nbt/CompoundTag;", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;<init>(Ljava/util/Map;)V"))
-    private Map<String, Tag> impl$checkForNullNBTValuesDuringCopy(Map<String, Tag> map) {
-        return Maps.newHashMap(Maps.filterEntries(map, entry -> {
-            if (entry.getValue() == null) {
-                final IllegalStateException exception = new IllegalStateException("There is a null NBT component in the compound for key: " + entry.getKey());
-                SpongeCommon.logger().error("Printing out a stacktrace to catch an exception in performing an NBTTagCompound.copy!\n"
-                                            + "If you are seeing this, then Sponge is preventing an exception from being thrown due to unforseen\n"
-                                            + "possible bugs in any mods present. Please report this to SpongePowered and/or the relative mod\n"
-                                            + "authors for the offending compound data!", exception);
-                return false;
-            }
-            return true;
-        }));
+        };
     }
-
 }

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerChunkCacheMixin.java

@@ -33,14 +33,17 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.common.accessor.server.level.ChunkMapAccessor;
 
 @Mixin(ServerChunkCache.class)
 public abstract class ServerChunkCacheMixin {
 
     // @formatter:off
     @Shadow @Final private ServerLevel level;
+    @Shadow @Final private ServerChunkCache.MainThreadExecutor mainThreadProcessor;
     // @formatter:on
 
     @Redirect(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;saveAllChunks(Z)V"))
@@ -51,4 +54,9 @@ public abstract class ServerChunkCacheMixin {
             ((ChunkMapAccessor) chunkManager).invoker$saveAllChunks(flush);
         }
     }
+
+    @Inject(method = "close", at = @At("TAIL"))
+    private void impl$onClose(final CallbackInfo ci) {
+        this.mainThreadProcessor.close();
+    }
 }

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerChunkCache_MainThreadExecutorMixin.java

@@ -0,0 +1,61 @@
+/*
+ * 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.server.level;
+
+import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.util.thread.BlockableEventLoop;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(ServerChunkCache.MainThreadExecutor.class)
+public abstract class ServerChunkCache_MainThreadExecutorMixin extends BlockableEventLoop<Runnable> {
+
+    private volatile boolean impl$closed;
+
+    protected ServerChunkCache_MainThreadExecutorMixin(final String $$0) {
+        super($$0);
+    }
+
+    @Override
+    public void schedule(final Runnable $$0) {
+        if (this.impl$closed) {
+            $$0.run();
+            return;
+        }
+
+        super.schedule($$0);
+
+        if (this.impl$closed) {
+            this.runAllTasks();
+        }
+    }
+
+    @Override
+    public void close() {
+        super.close();
+
+        this.impl$closed = true;
+        this.runAllTasks();
+    }
+}

src/mixins/java/org/spongepowered/common/mixin/core/server/level/ServerLevelMixin.java

@@ -163,6 +163,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel
     private Weather impl$prevWeather;
     private boolean impl$isManualSave = false;
     private long impl$preTickTime = 0L;
+    private boolean impl$closed = false;
 
     @Inject(method = "<init>", at = @At("TAIL"))
     private void impl$onInit(
@@ -216,7 +217,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerLevel
 
     @Override
     public boolean bridge$isLoaded() {
-        if (((LevelBridge) this).bridge$isFake()) {
+        if (((LevelBridge) this).bridge$isFake() || this.impl$closed) {
             return false;
         }
 
@@ -581,4 +582,9 @@ public String toString() {
         //Weather, game rules and spawns are per world in Sponge.
         instance.broadcastAll($$0, this.shadow$dimension());
     }
+
+    @Inject(method = "close", at = @At("HEAD"))
+    private void impl$onClose(final CallbackInfo ci) {
+        this.impl$closed = true;
+    }
 }

src/mixins/resources/mixins.sponge.core.json

@@ -78,6 +78,7 @@
     "server.level.DistanceManagerMixin",
     "server.level.GenerationChunkHolderMixin",
     "server.level.ServerBossEventMixin",
+    "server.level.ServerChunkCache_MainThreadExecutorMixin",
     "server.level.ServerChunkCacheMixin",
     "server.level.ServerEntityMixin",
     "server.level.ServerLevelMixin",