Merge pull request #15 from TBoshoven/1.14-magic-mirror-tile-entity-fix

Fix behavior around tile entity deletion

Author: TBoshoven

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/MagicMirrorBlock.java

@@ -117,21 +117,6 @@ public void onBlockPlacedBy(World worldIn, BlockPos pos, BlockState state, @Null
         }
     }
 
-    @Override
-    public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) {
-        super.neighborChanged(state, worldIn, pos, blockIn, fromPos, isMoving);
-
-        // Break the mirror if the other part is broken.
-        if (state.get(COMPLETE)) {
-            if (
-                    state.get(PART) == EnumPartType.TOP && worldIn.getBlockState(pos.down()).getBlock() != this ||
-                            state.get(PART) == EnumPartType.BOTTOM && worldIn.getBlockState(pos.up()).getBlock() != this
-            ) {
-                worldIn.setBlockState(pos, state.with(COMPLETE, false));
-            }
-        }
-    }
-
     @Override
     protected void fillStateContainer(StateContainer.Builder<Block, BlockState> builder) {
         builder.add(HORIZONTAL_FACING, COMPLETE, PART);
@@ -222,6 +207,13 @@ public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState
             if (tileEntity instanceof MagicMirrorBaseTileEntity) {
                 ((MagicMirrorBaseTileEntity) tileEntity).removeModifiers(worldIn, pos);
             }
+
+            // Change the other part to incomplete
+            BlockPos otherPos = state.get(PART) == EnumPartType.TOP ? pos.down() : pos.up();
+            BlockState otherState = worldIn.getBlockState(otherPos);
+            if (otherState.getBlock() == this) {
+                worldIn.setBlockState(otherPos, otherState.with(COMPLETE, false));
+            }
         }
         super.onReplaced(state, worldIn, pos, newState, isMoving);
     }

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/tileentities/MagicMirrorBaseTileEntity.java

@@ -113,11 +113,4 @@ public Direction getFacing() {
     public EnumPartType getPart() {
         return getBlockState().get(MagicMirrorBlock.PART);
     }
-
-    /**
-     * @return Whether the mirror is completely constructed.
-     */
-    public boolean isComplete() {
-        return getBlockState().get(MagicMirrorBlock.COMPLETE);
-    }
 }

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/tileentities/MagicMirrorPartTileEntity.java

@@ -24,9 +24,6 @@ public MagicMirrorPartTileEntity() {
     @Nullable
     @Override
     protected MagicMirrorCoreTileEntity getCore() {
-        if (!isComplete()) {
-            return null;
-        }
         if (core == null) {
             World world = getWorld();
             if (world != null) {

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/renderers/TileEntityMagicMirrorRenderer.java

@@ -38,20 +38,18 @@ class TileEntityMagicMirrorRenderer extends TileEntityRenderer<MagicMirrorBaseTi
     public void render(MagicMirrorBaseTileEntity te, double x, double y, double z, float partialTicks, int destroyStage) {
         super.render(te, x, y, z, partialTicks, destroyStage);
 
-        if (te.isComplete()) {
-            Reflection reflection = te.getReflection();
+        Reflection reflection = te.getReflection();
 
-            if (reflection != null) {
-                Entity reflected = reflection.getReflectedEntity();
-                if (reflected != null) {
-                    EnumPartType part = te.getPart();
-                    Direction facing = te.getFacing();
+        if (reflection != null) {
+            Entity reflected = reflection.getReflectedEntity();
+            if (reflected != null) {
+                EnumPartType part = te.getPart();
+                Direction facing = te.getFacing();
 
-                    Vec3d reflectedPos = reflected.getPositionVector();
-                    double distanceSq = te.getPos().distanceSq(reflectedPos.x, reflectedPos.y, reflectedPos.z, true);
+                Vec3d reflectedPos = reflected.getPositionVector();
+                double distanceSq = te.getPos().distanceSq(reflectedPos.x, reflectedPos.y, reflectedPos.z, true);
 
-                    renderReflection(reflection, x, y, z, partialTicks, part, facing, distanceSq);
-                }
+                renderReflection(reflection, x, y, z, partialTicks, part, facing, distanceSq);
             }
         }
     }

build.gradle

@@ -49,7 +49,7 @@ subprojects {
     }
 
     dependencies {
-        minecraft "net.minecraftforge:forge:1.14.4-28.2.3"
+        minecraft "net.minecraftforge:forge:1.14.4-28.2.16"
 
         implementation 'com.google.code.findbugs:jsr305:3.0.2'
     }