Replace TileEntity.getCustomManipulators() with TileEntity.getContain…

…ers() for BlockSnapshot creation.
SpongePowered · May 8, 2018 · 02959fb · 02959fb
1 parent 5fdd7d1
commit 02959fb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/src/main/java/org/spongepowered/common/block/SpongeBlockSnapshotBuilder.java b/src/main/java/org/spongepowered/common/block/SpongeBlockSnapshotBuilder.java
@@ -52,7 +52,6 @@
 import org.spongepowered.common.data.util.DataQueries;
 import org.spongepowered.common.data.util.DataUtil;
 import org.spongepowered.common.data.util.NbtDataUtil;
-import org.spongepowered.common.interfaces.data.IMixinCustomDataHolder;
 import org.spongepowered.common.world.SpongeBlockChangeFlag;
 
 import java.util.Iterator;
@@ -123,7 +122,7 @@ public SpongeBlockSnapshotBuilder from(Location<World> location) {
                 this.compound = new NBTTagCompound();
                 org.spongepowered.api.block.tileentity.TileEntity te = location.getTileEntity().get();
                 ((TileEntity) te).writeToNBT(this.compound);
-                this.manipulators = ((IMixinCustomDataHolder) te).getCustomManipulators().stream()
+                this.manipulators = te.getContainers().stream()
                         .map(DataManipulator::asImmutable)
                         .collect(Collectors.toList());
             }

diff --git a/src/main/java/org/spongepowered/common/mixin/core/block/state/MixinStateImplementation.java b/src/main/java/org/spongepowered/common/mixin/core/block/state/MixinStateImplementation.java
@@ -57,7 +57,6 @@
 import org.spongepowered.common.data.util.DataVersions;
 import org.spongepowered.common.interfaces.block.IMixinBlock;
 import org.spongepowered.common.interfaces.block.IMixinBlockState;
-import org.spongepowered.common.interfaces.data.IMixinCustomDataHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -104,7 +103,7 @@ public BlockSnapshot snapshotFor(Location<World> location) {
             .worldId(location.getExtent().getUniqueId());
         if (this.block.hasTileEntity() && location.getBlockType().equals(this.block)) {
             final TileEntity tileEntity = location.getTileEntity().get();
-            for (DataManipulator<?, ?> manipulator : ((IMixinCustomDataHolder) tileEntity).getCustomManipulators()) {
+            for (DataManipulator<?, ?> manipulator : tileEntity.getContainers()) {
                 builder.add(manipulator);
             }
             final NBTTagCompound compound = new NBTTagCompound();

diff --git a/src/main/java/org/spongepowered/common/mixin/core/world/MixinWorld.java b/src/main/java/org/spongepowered/common/mixin/core/world/MixinWorld.java
@@ -132,7 +132,6 @@
 import org.spongepowered.common.event.tracking.phase.block.BlockPhase;
 import org.spongepowered.common.interfaces.IMixinChunk;
 import org.spongepowered.common.interfaces.block.tile.IMixinTileEntity;
-import org.spongepowered.common.interfaces.data.IMixinCustomDataHolder;
 import org.spongepowered.common.interfaces.entity.IMixinEntity;
 import org.spongepowered.common.interfaces.entity.player.IMixinEntityPlayer;
 import org.spongepowered.common.interfaces.util.math.IMixinBlockPos;
@@ -742,7 +741,7 @@ public BlockSnapshot createSnapshot(int x, int y, int z) {
         }
         if (te.isPresent()) {
             final TileEntity tileEntity = te.get();
-            for (DataManipulator<?, ?> manipulator : ((IMixinCustomDataHolder) tileEntity).getCustomManipulators()) {
+            for (DataManipulator<?, ?> manipulator : tileEntity.getContainers()) {
                 builder.add(manipulator);
             }
             final NBTTagCompound compound = new NBTTagCompound();