Clean up several code areas around CM blocks

Author: robotgryphon

src/main/java/dev/compactmods/machines/block/BlockCompactMachine.java

@@ -51,11 +51,6 @@ public BlockCompactMachine(EnumMachineSize size, AbstractBlock.Properties props)
         this.size = size;
     }
 
-    @Override
-    public void entityInside(BlockState p_196262_1_, World p_196262_2_, BlockPos p_196262_3_, Entity p_196262_4_) {
-        super.entityInside(p_196262_1_, p_196262_2_, p_196262_3_, p_196262_4_);
-    }
-
     @Override
     public float getDestroyProgress(BlockState state, PlayerEntity player, IBlockReader worldIn, BlockPos pos) {
         CompactMachineTile tile = (CompactMachineTile) worldIn.getBlockEntity(pos);
@@ -238,13 +233,6 @@ public ItemStack getPickBlock(BlockState state, RayTraceResult target, IBlockRea
         return stack;
     }
 
-
-//    @Override
-//    public String getSpecialName(ItemStack stack) {
-//        return this.getStateFromMeta(stack.getItemDamage()).getValue(SIZE).getName();
-//    }
-
-
     @Override
     public boolean hasTileEntity(BlockState state) {
         return true;
@@ -256,27 +244,6 @@ public TileEntity createTileEntity(BlockState state, IBlockReader world) {
         return new CompactMachineTile();
     }
 
-    @Override
-    public void destroy(IWorld world, BlockPos pos, BlockState state) {
-        if (world.isClientSide()) {
-            super.destroy(world, pos, state);
-            return;
-        }
-
-        if (!(world.getBlockEntity(pos) instanceof CompactMachineTile)) {
-            return;
-        }
-
-        CompactMachineTile te = (CompactMachineTile) world.getBlockEntity(pos);
-//        WorldSavedDataMachines.INSTANCE.removeMachinePosition(te.coords);
-//
-//        BlockMachine.spawnItemWithNBT(world, pos, state.get(BlockMachine.SIZE), te);
-//
-//        ChunkLoadingMachines.unforceChunk(te.coords);
-
-        super.destroy(world, pos, state);
-    }
-
     @Override
     public void setPlacedBy(World worldIn, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
 
@@ -315,7 +282,6 @@ public void setPlacedBy(World worldIn, BlockPos pos, BlockState state, @Nullable
         }
 
         tile.doPostPlaced();
-        tile.setChanged();
     }
 
     @Override
@@ -350,46 +316,4 @@ public EnumMachineSize getSize() {
     public void addProbeData(IProbeData data, PlayerEntity player, World world, BlockState state) {
         CompactMachineProvider.exec(data, world);
     }
-
-    // 1.12.1 code
-//    @Override
-//    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
-//        if(player.isSneaking()) {
-//            return false;
-//        }
-//
-//        if(world.isRemote || !(player instanceof EntityPlayerMP)) {
-//            return true;
-//        }
-//
-//        if(!(world.getTileEntity(pos) instanceof TileEntityMachine)) {
-//            return false;
-//        }
-//
-//        TileEntityMachine machine = (TileEntityMachine)world.getTileEntity(pos);
-//        ItemStack playerStack = player.getHeldItemMainhand();
-//        if(ShrinkingDeviceUtils.isShrinkingDevice(playerStack)) {
-//            TeleportationTools.tryToEnterMachine(player, machine);
-//            return true;
-//        }
-//
-//        player.openGui(compactmachines.instance, GuiIds.MACHINE_VIEW.ordinal(), world, pos.getX(), pos.getY(), pos.getZ());
-//        PackageHandler.instance.sendTo(new MessageMachineContent(machine.coords), (EntityPlayerMP)player);
-//        PackageHandler.instance.sendTo(new MessageMachineChunk(machine.coords), (EntityPlayerMP)player);
-//
-//        return true;
-//    }
-
-// TOP code
-//    @Override
-//    public String getID() {
-//        return CompactMachines.MODID + ":" + "machine";
-//    }
-//
-//    @Override
-//    public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, PlayerEntity player, World world, BlockState blockState, IProbeHitData data) {
-//        String size = this.size.getName();
-//        probeInfo.text(new TranslationTextComponent("machines.sizes." + size));
-//
-    // }
 }

src/main/java/dev/compactmods/machines/block/tiles/CompactMachineTile.java

@@ -46,12 +46,9 @@ public class CompactMachineTile extends TileEntity implements ICapabilityProvide
     protected UUID owner;
     protected String schema;
     protected boolean locked = false;
-    protected Set<String> playerWhiteList;
 
     public CompactMachineTile() {
         super(Registration.MACHINE_TILE_ENTITY.get());
-
-        playerWhiteList = new HashSet<>();
     }
 
     @Override
@@ -114,12 +111,6 @@ public void load(BlockState state, CompoundNBT nbt) {
         } else {
             locked = false;
         }
-
-        playerWhiteList = new HashSet<>();
-        if (nbt.contains("playerWhiteList")) {
-            ListNBT list = nbt.getList("playerWhiteList", Constants.NBT.TAG_STRING);
-            list.forEach(nametag -> playerWhiteList.add(nametag.getAsString()));
-        }
     }
 
     @Override
@@ -140,16 +131,6 @@ public CompoundNBT save(CompoundNBT nbt) {
 
         nbt.putBoolean("locked", locked);
 
-        if (playerWhiteList.size() > 0) {
-            ListNBT list = new ListNBT();
-            playerWhiteList.forEach(player -> {
-                StringNBT nameTag = StringNBT.valueOf(player);
-                list.add(nameTag);
-            });
-
-            nbt.put("playerWhiteList", list);
-        }
-
         return nbt;
     }
 
@@ -291,8 +272,9 @@ public boolean hasPlayersInside() {
     }
 
     public void doPostPlaced() {
-        if (this.level == null || this.level.isClientSide)
+        if (this.level == null || this.level.isClientSide) {
             return;
+        }
 
         MinecraftServer serv = this.level.getServer();
         if (serv == null)
@@ -308,6 +290,8 @@ public void doPostPlaced() {
 
         if(ServerConfig.MACHINE_CHUNKLOADING.get())
             CompactMachines.CHUNKLOAD_MANAGER.onMachineChunkLoad(machineId);
+
+        this.setChanged();
     }
 
     public void handlePlayerLeft(UUID playerID) {