Update for changes to Chunk API

dualspiral · web-flow · commit 6ce93f5b6eeb · 2021-05-09T12:51:13.000+01:00
Include some implementation for the Chunk interface (still need to finish volume streams)
diff --git a/SpongeAPI b/SpongeAPI
@@ -1 +1 @@
-Subproject commit 3507dc590cb993e68b8cdd9580e49da1c888dd9d
+Subproject commit 28097dda7bfbdcc13b36e37ea5519ec598db8bfe
diff --git a/src/main/java/org/spongepowered/common/util/ChunkUtil.java b/src/main/java/org/spongepowered/common/util/ChunkUtil.java
@@ -0,0 +1,56 @@
+/*
+ * 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.util;
+
+import net.minecraft.util.Mth;
+import net.minecraft.world.level.chunk.ChunkBiomeContainer;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.spongepowered.api.world.biome.Biome;
+import org.spongepowered.common.accessor.world.level.chunk.ChunkBiomeContainerAccessor;
+
+public final class ChunkUtil {
+
+    private ChunkUtil() {
+    }
+
+    public static boolean setBiome(final @Nullable ChunkBiomeContainer biomeContainer,
+                                   final int x, final int y, final int z, final Biome biome) {
+        if (biomeContainer == null) {
+            return false;
+        }
+        final net.minecraft.world.level.biome.Biome[] biomes = ((ChunkBiomeContainerAccessor) biomeContainer).accessor$biomes();
+
+        final int maskedX = x & ChunkBiomeContainer.HORIZONTAL_MASK;
+        final int maskedY = Mth.clamp(y, 0, ChunkBiomeContainer.VERTICAL_MASK);
+        final int maskedZ = z & ChunkBiomeContainer.HORIZONTAL_MASK;
+
+        final int WIDTH_BITS = ChunkBiomeContainerAccessor.accessor$WIDTH_BITS();
+        final int posKey = maskedY << WIDTH_BITS + WIDTH_BITS | maskedZ << WIDTH_BITS | maskedX;
+        biomes[posKey] = (net.minecraft.world.level.biome.Biome) (Object) biome;
+
+        return true;
+    }
+
+}
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/ChunkAccessMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/ChunkAccessMixin_API.java
@@ -0,0 +1,69 @@
+/*
+ * 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.api.mcp.world.level.chunk;
+
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkBiomeContainer;
+import net.minecraft.world.level.chunk.ChunkStatus;
+import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.world.biome.Biome;
+import org.spongepowered.api.world.chunk.ChunkState;
+import org.spongepowered.api.world.chunk.ProtoChunk;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.common.util.ChunkUtil;
+
+import javax.annotation.Nullable;
+
+@Mixin(ChunkAccess.class)
+public interface ChunkAccessMixin_API<P extends ProtoChunk<P>> extends ProtoChunk<P> {
+
+    // @formatter:on
+    @Shadow ChunkStatus shadow$getStatus();
+    @Shadow @Nullable ChunkBiomeContainer shadow$getBiomes();
+    @Shadow void shadow$addEntity(net.minecraft.world.entity.Entity entity);
+    // @formatter:off
+
+    @Override
+    default void addEntity(final Entity entity) {
+        this.shadow$addEntity((net.minecraft.world.entity.Entity) entity);
+    }
+
+    @Override
+    default ChunkState state() {
+        return (ChunkState) this.shadow$getStatus();
+    }
+
+    @Override
+    default boolean isEmpty() {
+        return this.shadow$getStatus() == ChunkStatus.EMPTY;
+    }
+
+    @Override
+    default boolean setBiome(final int x, final int y, final int z, final Biome biome) {
+        return ChunkUtil.setBiome(this.shadow$getBiomes(), x, y, z, biome);
+    }
+
+}
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/ChunkStatusMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/ChunkStatusMixin_API.java
@@ -0,0 +1,42 @@
+/*
+ * 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.api.mcp.world.level.chunk;
+
+import net.minecraft.world.level.chunk.ChunkStatus;
+import org.spongepowered.api.world.chunk.ChunkState;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(ChunkStatus.class)
+public abstract class ChunkStatusMixin_API implements ChunkState {
+
+    @Shadow public abstract boolean isOrAfter(ChunkStatus param0);
+
+    @Override
+    public boolean isAfter(final ChunkState state) {
+        return !this.equals(state) && this.isOrAfter((ChunkStatus) state);
+    }
+
+}
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/EmptyLevelChunkMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/EmptyLevelChunkMixin_API.java
@@ -0,0 +1,39 @@
+/*
+ * 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.api.mcp.world.level.chunk;
+
+import net.minecraft.world.level.chunk.EmptyLevelChunk;
+import org.spongepowered.api.world.biome.Biome;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(EmptyLevelChunk.class)
+public abstract class EmptyLevelChunkMixin_API extends LevelChunkMixin_API {
+
+    @Override
+    public boolean setBiome(final int x, final int y, final int z, final Biome biome) {
+        return false;
+    }
+
+}
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/LevelChunkMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/LevelChunkMixin_API.java
@@ -39,15 +39,20 @@
 import org.spongepowered.api.block.BlockState;
 import org.spongepowered.api.block.entity.BlockEntity;
 import org.spongepowered.api.entity.Entity;
+import org.spongepowered.api.util.Ticks;
 import org.spongepowered.api.world.biome.Biome;
 import org.spongepowered.api.world.chunk.Chunk;
 import org.spongepowered.api.world.volume.stream.StreamOptions;
 import org.spongepowered.api.world.volume.stream.VolumeStream;
 import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Implements;
+import org.spongepowered.asm.mixin.Interface;
 import org.spongepowered.asm.mixin.Intrinsic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.common.accessor.world.level.chunk.ChunkBiomeContainerAccessor;
+import org.spongepowered.common.util.ChunkUtil;
+import org.spongepowered.common.util.SpongeTicks;
 import org.spongepowered.common.world.volume.VolumeStreamUtils;
 import org.spongepowered.common.world.volume.buffer.biome.ObjectArrayMutableBiomeBuffer;
 import org.spongepowered.common.world.volume.buffer.block.ArrayMutableBlockBuffer;
@@ -61,6 +66,7 @@
 import java.util.stream.Stream;
 
 @Mixin(net.minecraft.world.level.chunk.LevelChunk.class)
+@Implements(@Interface(iface = Chunk.class, prefix = "chunk$"))
 public abstract class LevelChunkMixin_API implements Chunk {
 
     //@formatter:off
@@ -69,37 +75,22 @@ public abstract class LevelChunkMixin_API implements Chunk {
     @Shadow @Final private ChunkPos chunkPos;
     @Shadow @Final private Level level;
 
-    @Shadow public abstract void shadow$setInhabitedTime(long p_177415_1_);
+    @Shadow public abstract boolean shadow$isEmpty();
     //@formatter:on
 
     @Override
     public boolean setBiome(final int x, final int y, final int z, final Biome biome) {
-        final net.minecraft.world.level.biome.Biome[] biomes = ((ChunkBiomeContainerAccessor) this.biomes).accessor$biomes();
-
-        int maskedX = x & ChunkBiomeContainer.HORIZONTAL_MASK;
-        int maskedY = Mth.clamp(y, 0, ChunkBiomeContainer.VERTICAL_MASK);
-        int maskedZ = z & ChunkBiomeContainer.HORIZONTAL_MASK;
-
-        final int WIDTH_BITS = ChunkBiomeContainerAccessor.accessor$WIDTH_BITS();
-        final int posKey = maskedY << WIDTH_BITS + WIDTH_BITS | maskedZ << WIDTH_BITS | maskedX;
-        biomes[posKey] = (net.minecraft.world.level.biome.Biome) (Object) biome;
-
-        return true;
-    }
-
-    @Intrinsic
-    public long impl$getInhabitedTime() {
-        return this.inhabitedTime;
+        return ChunkUtil.setBiome(this.biomes, x, y, z, biome);
     }
 
-    @Intrinsic
-    public void impl$setInhabitedTime(long newInhabitedTime) {
-        this.shadow$setInhabitedTime(newInhabitedTime);
+    @Override
+    public Ticks inhabitedTime() {
+        return new SpongeTicks(this.inhabitedTime);
     }
 
     @Override
-    public long inhabitedTime() {
-        return this.inhabitedTime;
+    public void setInhabitedTime(final Ticks newInhabitedTime) {
+        this.inhabitedTime = newInhabitedTime.ticks();
     }
 
     @Override
@@ -110,23 +101,28 @@ public Vector3i chunkPosition() {
     @Override
     public double regionalDifficultyFactor() {
         return new DifficultyInstance(this.level.getDifficulty(), this.level.getDayTime(),
-                this.inhabitedTime(), this.level.getMoonBrightness()).getEffectiveDifficulty();
+                this.inhabitedTime().ticks(), this.level.getMoonBrightness()).getEffectiveDifficulty();
     }
 
     @Override
     public double regionalDifficultyPercentage() {
         return new DifficultyInstance(this.level.getDifficulty(), this.level.getDayTime(),
-                this.inhabitedTime(), this.level.getMoonBrightness()).getSpecialMultiplier();
+                this.inhabitedTime().ticks(), this.level.getMoonBrightness()).getSpecialMultiplier();
     }
 
     @Override
     public org.spongepowered.api.world.World<?, ?> world() {
         return ((org.spongepowered.api.world.World<?, ?>) this.level);
     }
 
+    @Intrinsic
+    public boolean chunk$isEmpty() {
+        return this.shadow$isEmpty();
+    }
+
     @Override
     public VolumeStream<Chunk, Entity> entityStream(
-        Vector3i min, Vector3i max, StreamOptions options
+        final Vector3i min, final Vector3i max, final StreamOptions options
     ) {
         VolumeStreamUtils.validateStreamArgs(
             Objects.requireNonNull(min, "min"), Objects.requireNonNull(max, "max"),
@@ -165,7 +161,7 @@ public VolumeStream<Chunk, Entity> entityStream(
 
     @Override
     public VolumeStream<Chunk, BlockState> blockStateStream(
-        Vector3i min, Vector3i max, StreamOptions options
+        final Vector3i min, final Vector3i max, final StreamOptions options
     ) {
         VolumeStreamUtils.validateStreamArgs(Objects.requireNonNull(min, "min"), Objects.requireNonNull(max, "max"),
             Objects.requireNonNull(options, "options"));
@@ -206,7 +202,7 @@ public VolumeStream<Chunk, BlockState> blockStateStream(
 
     @Override
     public VolumeStream<Chunk, BlockEntity> blockEntityStream(
-        Vector3i min, Vector3i max, StreamOptions options
+        final Vector3i min, final Vector3i max, final StreamOptions options
     ) {
         VolumeStreamUtils.validateStreamArgs(Objects.requireNonNull(min, "min"), Objects.requireNonNull(max, "max"),
             Objects.requireNonNull(options, "options"));
@@ -242,13 +238,13 @@ public VolumeStream<Chunk, BlockEntity> blockEntityStream(
         );
     }
 
-    private Stream<Map.Entry<BlockPos, net.minecraft.world.level.block.entity.BlockEntity>> impl$getBlockEntitiesStream(ChunkAccess chunk) {
+    private Stream<Map.Entry<BlockPos, net.minecraft.world.level.block.entity.BlockEntity>> impl$getBlockEntitiesStream(final ChunkAccess chunk) {
         return chunk instanceof LevelChunk ? ((LevelChunk) chunk).getBlockEntities().entrySet().stream() : Stream.empty();
     }
 
     @Override
     public VolumeStream<Chunk, Biome> biomeStream(
-        Vector3i min, Vector3i max, StreamOptions options
+        final Vector3i min, final Vector3i max, final StreamOptions options
     ) {
         VolumeStreamUtils.validateStreamArgs(Objects.requireNonNull(min, "min"), Objects.requireNonNull(max, "max"),
             Objects.requireNonNull(options, "options"));
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/ProtoChunkMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/chunk/ProtoChunkMixin_API.java
diff --git a/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/levelgen/Heightmap_TypeMixin_API.java b/src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/level/levelgen/Heightmap_TypeMixin_API.java
diff --git a/src/mixins/resources/mixins.sponge.api.json b/src/mixins/resources/mixins.sponge.api.json
